[vlc-commits] [Git][videolan/libvlcpp][master] MediaPlayer: adapt with recent LibVLC changes
Thomas Guillem pushed to branch master at VideoLAN / libvlcpp
Commits:
0116906d by Thomas Guillem at 2022-12-13T11:44:32+01:00
MediaPlayer: adapt with recent LibVLC changes
Replace libvlc_audio_XXX_channel with libvlc_audio_XXX_stereomode
The values come from an enum and are mostly compatible with older values.
Add mixMode/setMixMode functions.
- - - - -
2 changed files:
- .gitlab-ci.yml
- vlcpp/MediaPlayer.hpp
Changes:
=
.gitlab-ci.yml
=
@@ -1,6 +1,6 @@
variables:
VLC30_IMAGE: registry.videolan.org/medialibrary:20201009131431
- VLC40_IMAGE: registry.videolan.org/libvlcpp-unstable:20220727093032
+ VLC40_IMAGE: registry.videolan.org/libvlcpp-unstable:20221213095400
.common_build:
rules:
=
vlcpp/MediaPlayer.hpp
=
@@ -1032,7 +1032,6 @@ public:
{
return libvlc_audio_set_track(*this, i_track) == 0;
}
-#endif
/**
* Get current audio channel.
@@ -1057,6 +1056,47 @@ public:
{
return libvlc_audio_set_channel(*this, channel) == 0;
}
+#else // libvlc 4.0
+/**
+ * Get current audio stereo mode.
+ *
+ * \return the audio stereo mode
+ */
+libvlc_audio_output_stereomode_t stereoMode()
+{
+return libvlc_audio_get_stereomode(*this);
+}
+
+/**
+ * Set current audio stereo mode.
+ *
+ * \param mode the audio stereo mode
+ */
+bool setStereoMode(libvlc_audio_output_stereomode_t mode)
+{
+return libvlc_audio_set_stereomode(*this, mode) == 0;
+}
+
+/**
+ * Get current audio mix mode.
+ *
+ * \return the audio mix mode
+ */
+libvlc_audio_output_mixmode_t mixMode()
+{
+return libvlc_audio_get_mixmode(*this);
+}
+
+/**
+ * Set current audio mix mode.
+ *
+ * \param mode the audio mix mode
+ */
+bool setMixMode(libvlc_audio_output_mixmode_t mode)
+{
+return libvlc_audio_set_mixmode(*this, mode) == 0;
+}
+#endif // libvlc 4.0
/**
* Get current audio delay.
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/0116906d78ef4d8a02c38ff51e83cfb48923a017
--
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/0116906d78ef4d8a02c38ff51e83cfb48923a017
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 6 commits: macosx: Extract view setup parts in VLCLibraryAudioDataSource into separate methods
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
a9084b53 by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Extract view setup parts in VLCLibraryAudioDataSource into separate
methods
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
0bd9b55c by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Define songs table column identifiers as static global NSStrings
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
cd272a2a by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Add NSSortDescriptors to songs table view
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
02e4203a by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Make song table view headers functional, change sort
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
855ea3ea by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Correctly set initial sort on song table view init
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
02343458 by Claudio Cambra at 2022-12-13T11:37:31+00:00
macosx: Ensure song table view headers are updated on library sort change
Signed-off-by: Claudio Cambra develo...@claudiocambra.com
- - - - -
1 changed file:
- modules/gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m
Changes:
=
modules/gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m
=
@@ -44,6 +44,23 @@
#import "views/VLCImageView.h"
#import "views/VLCSubScrollView.h"
+static NSString *VLCLibrarySongsTableViewSongPlayingColumnIdentifier =
@"VLCLibrarySongsTableViewSongPlayingColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewTitleColumnIdentifier =
@"VLCLibrarySongsTableViewTitleColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewDurationColumnIdentifier =
@"VLCLibrarySongsTableViewDurationColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewArtistColumnIdentifier =
@"VLCLibrarySongsTableViewArtistColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewAlbumColumnIdentifier =
@"VLCLibrarySongsTableViewAlbumColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewGenreColumnIdentifier =
@"VLCLibrarySongsTableViewGenreColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewPlayCountColumnIdentifier =
@"VLCLibrarySongsTableViewPlayCountColumnIdentifier";
+static NSString *VLCLibrarySongsTableViewYearColumnIdentifier =
@"VLCLibrarySongsTableViewYearColumnIdentifier";
+
+static NSString *VLCLibraryTitleSortDescriptorKey =
@"VLCLibraryTitleSortDescriptorKey";
+static NSString *VLCLibraryDurationSortDescriptorKey =
@"VLCLibraryDurationSortDescriptorKey";
+static NSString *VLCLibraryArtistSortDescriptorKey =
@"VLCLibraryArtistSortDescriptorKey";
+static NSString *VLCLibraryAlbumSortDescriptorKey =
@"VLCLibraryAlbumSortDescriptorKey";
+static NSString *VLCLibraryPlayCountSortDescriptorKey =
@"VLCLibraryPlayCountSortDescriptorKey";
+static NSString *VLCLibraryYearSortDescriptorKey =
@"VLCLibraryYearSortDescriptorKey";
+// TODO: Add sorting by genre
+
@interface VLCLibraryAudioDataSource ()
{
VLCLibraryCollectionViewFlowLayout *_collectionViewFlowLayout;
@@ -226,6 +243,14 @@
}
- (void)setup
+{
+[self setupCollectionView];
+[self setupTableViews];
+
+_audioLibrarySegment = -1; // Force setAudioLibrarySegment to do something
always on first try
+}
+
+- (void)setupCollectionView
{
_collectionView.dataSource = self;
_collectionView.delegate = self;
@@ -234,12 +259,12 @@
NSNib *albumSupplementaryDetailView = [[NSNib alloc]
initWithNibNamed:@"VLCLibraryCollectionViewAlbumSupplementaryDetailView"
bundle:nil];
[_collectionView registerNib:albumSupplementaryDetailView
-
forSupplementaryViewOfKind:VLCLibraryCollectionViewAlbumSupplementaryDetailViewKind
+
forSupplementaryViewOfKind:VLCLibraryCollectionViewAlbumSupplementaryDetailViewKind
withIdentifier:VLCLibraryCollectionViewAlbumSupplementaryDetailViewIdentifier];
NSNib *audioGroupSupplementaryDetailView = [[NSNib alloc]
initWithNibNamed:@"VLCLibraryCollectionViewAudioGroupSupplementaryDetailView"
bundle:nil];
[_collectionView registerNib:audioGroupSupplementaryDetailView
-
forSupplementaryViewOfKind:VLCLibraryCollectionViewAudioGroupSupplementaryDetailViewKind
+
forSupplementaryViewOfKind:VLCLibraryCollectionViewAudioGroupSupplementaryDetailViewKind
withIdentifier:VLCLibraryCollectionViewAudioGroupSupplementaryDetailViewIdentifier];
NSNib *mediaItemSupplementaryDetailView = [[NSNib alloc]
initWithNibNamed:@"VLCLibraryCollectionViewMediaItemSupplementaryDetailView"
bundle:nil];
@@ -249,15 +274,99 @@
_collectionViewFlowLayout = [[VLCLibraryCollectionViewFlowLayout alloc]
init];
_collectionView.collectionViewLayout = _collectionViewFlowLayout;
+}
+- (void)setupTableViews
+{
[vlc-commits] [Git][videolan/vlc][master] opengl: interop: fix divbyzero YUYV
Steve Lhomme pushed to branch master at VideoLAN / VLC Commits: 2d9100ed by Francois Cartegnie at 2022-12-13T09:30:41+00:00 opengl: interop: fix divbyzero YUYV regression by b9edc720b80151fe5b511df283afb432b8576582 - - - - - 1 changed file: - modules/video_output/opengl/interop_sw.c Changes: = modules/video_output/opengl/interop_sw.c = @@ -213,7 +213,7 @@ tc_pbo_update(const struct vlc_gl_interop *interop, uint32_t textures[], /* For YUV 4:2:2 formats, a single plane is uploaded into 2 textures */ priv->gl.ActiveTexture(GL_TEXTURE1); priv->gl.BindTexture(interop->tex_target, textures[1]); -priv->gl.PixelStorei(GL_UNPACK_ROW_LENGTH, pic->p[1].i_pitch / pic->p[1].i_pixel_pitch); +priv->gl.PixelStorei(GL_UNPACK_ROW_LENGTH, (pic->p[0].i_pitch / pic->p[0].i_pixel_pitch) >> 1); /* yuv[Y] */ priv->gl.TexSubImage2D(interop->tex_target, 0, 0, 0, tex_width[1], tex_height[1], interop->texs[1].format, interop->texs[1].type, NULL); priv->gl.PixelStorei(GL_UNPACK_ROW_LENGTH, 0); View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2d9100ed9c1780d5b1eada4d64712265f36a5139 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2d9100ed9c1780d5b1eada4d64712265f36a5139 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
