[vlc-commits] [Git][videolan/vlc][master] macosx: Add separator between editable fields and location field in information window
Felix Paul Kühne pushed to branch master at VideoLAN / VLC Commits: d7207587 by Claudio Cambra at 2024-06-09T16:25:54+00:00 macosx: Add separator between editable fields and location field in information window Makes it visually much clearer that the location cannot be changed and saved in the information window Signed-off-by: Claudio Cambra develo...@claudiocambra.com - - - - - 1 changed file: - modules/gui/macosx/UI/VLCInformationWindow.xib Changes: = modules/gui/macosx/UI/VLCInformationWindow.xib = @@ -466,6 +466,9 @@ + + + @@ -506,12 +509,13 @@ + + - @@ -552,6 +556,7 @@ + @@ -567,6 +572,7 @@ + View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d7207587d0b29bf643cabe0dab486f0a91660301 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d7207587d0b29bf643cabe0dab486f0a91660301 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] 4 commits: macosx: Handle case when right-clicked collection view item is not selected
Felix Paul Kühne pushed to branch master at VideoLAN / VLC Commits: 6e000aec by Claudio Cambra at 2024-06-09T16:11:39+00:00 macosx: Handle case when right-clicked collection view item is not selected Signed-off-by: Claudio Cambra develo...@claudiocambra.com - - - - - 16f59826 by Claudio Cambra at 2024-06-09T16:11:39+00:00 macosx: Ensure we correctly check if a collection views item is selected NSArrays indexOf: will just check if it is the same object in the NSArray. Instead check for a matching libraryId. Signed-off-by: Claudio Cambra develo...@claudiocambra.com - - - - - 47b1b312 by Claudio Cambra at 2024-06-09T16:11:39+00:00 macosx: Match right-click unselected collection view item behaviour with Finder Signed-off-by: Claudio Cambra develo...@claudiocambra.com - - - - - 1f7ffcef by Claudio Cambra at 2024-06-09T16:11:39+00:00 macosx: Fix handling of clicked row vs selected row for library table view context menu Signed-off-by: Claudio Cambra develo...@claudiocambra.com - - - - - 2 changed files: - modules/gui/macosx/library/VLCLibraryCollectionViewItem.m - modules/gui/macosx/library/VLCLibraryTableView.m Changes: = modules/gui/macosx/library/VLCLibraryCollectionViewItem.m = @@ -296,8 +296,21 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95; NSObject * const dataSource = (NSObject *)collectionView.dataSource; NSSet * const indexPaths = collectionView.selectionIndexPaths; -NSArray * const items = +NSArray * const selectedItems = [dataSource representedItemsAtIndexPaths:indexPaths forCollectionView:collectionView]; +const NSInteger representedItemIndex = [selectedItems indexOfObjectPassingTest:^BOOL( +VLCLibraryRepresentedItem * const repItem, const NSUInteger idx, BOOL * const stop +) { +return repItem.item.libraryID == self.representedItem.item.libraryID; +}]; +NSArray *items = nil; + +if (representedItemIndex == NSNotFound) { +items = @[self.representedItem]; +} else { +items = selectedItems; +} + _menuController.representedItems = items; } else { _menuController.representedItems = @[self.representedItem]; = modules/gui/macosx/library/VLCLibraryTableView.m = @@ -80,15 +80,28 @@ const id vlcLibraryDataSource = (id)self.dataSource; -[indices enumerateIndexesUsingBlock:^(const NSUInteger index, BOOL * const stop) { +if ([indices containsIndex:self.clickedRow]) { +[indices enumerateIndexesUsingBlock:^(const NSUInteger index, BOOL * const stop) { +const id mediaItem = +[vlcLibraryDataSource libraryItemAtRow:index forTableView:self]; +const VLCMediaLibraryParentGroupType parentType = +vlcLibraryDataSource.currentParentType; +VLCLibraryRepresentedItem * const representedItem = +[[VLCLibraryRepresentedItem alloc] initWithItem:mediaItem + parentType:parentType]; +[representedItems addObject:representedItem]; +}]; +} else { const id mediaItem = -[vlcLibraryDataSource libraryItemAtRow:index forTableView:self]; +[vlcLibraryDataSource libraryItemAtRow:self.clickedRow forTableView:self]; const VLCMediaLibraryParentGroupType parentType = vlcLibraryDataSource.currentParentType; VLCLibraryRepresentedItem * const representedItem = -[[VLCLibraryRepresentedItem alloc] initWithItem:mediaItem parentType:parentType]; +[[VLCLibraryRepresentedItem alloc] initWithItem:mediaItem + parentType:parentType]; [representedItems addObject:representedItem]; -}]; +} + _menuController.representedItems = representedItems; } else if (self.dataSource.class == VLCMediaSourceDataSource.class) { View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4156b1105c98d33b79c7d1155945d29f3bd95aee...1f7ffcef4d37c55eeaa0011bedc9a16ec5f0cddf -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4156b1105c98d33b79c7d1155945d29f3bd95aee...1f7ffcef4d37c55eeaa0011bedc9a16ec5f0cddf 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] 4 commits: qt: introduce DeviceSourcesProvider
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: c5dc278f by Prince Gupta at 2024-06-09T15:51:11+00:00 qt: introduce DeviceSourcesProvider helper class to get list of media sources - - - - - f46dbd59 by Prince Gupta at 2024-06-09T15:51:11+00:00 qt: introduce WorkerThreadSet - - - - - e497bd8f by Prince Gupta at 2024-06-09T15:51:11+00:00 qt: provide WorkerThreadSet from MainCtx - - - - - 4156b110 by Prince Gupta at 2024-06-09T15:51:11+00:00 qt: move data query from main thread in NetworkDeviceModel fixes #28648 #27087 #27378 - - - - - 10 changed files: - modules/gui/qt/Makefile.am - modules/gui/qt/maininterface/mainctx.cpp - modules/gui/qt/maininterface/mainctx.hpp - modules/gui/qt/meson.build - + modules/gui/qt/network/devicesourceprovider.cpp - + modules/gui/qt/network/devicesourceprovider.hpp - modules/gui/qt/network/networkdevicemodel.cpp - modules/gui/qt/network/networkdevicemodel.hpp - + modules/gui/qt/util/workerthreadset.cpp - + modules/gui/qt/util/workerthreadset.hpp Changes: = modules/gui/qt/Makefile.am = @@ -237,6 +237,8 @@ libqt_plugin_la_SOURCES = \ menus/menus.cpp menus/menus.hpp \ network/mediatreelistener.cpp \ network/mediatreelistener.hpp \ + network/devicesourceprovider.cpp \ + network/devicesourceprovider.hpp \ network/networkdevicemodel.cpp \ network/networkdevicemodel.hpp \ network/networksourcesmodel.cpp \ @@ -275,6 +277,7 @@ libqt_plugin_la_SOURCES = \ util/asynctask.hpp \ util/audio_device_model.cpp \ util/audio_device_model.hpp \ + util/workerthreadset.hpp util/workerthreadset.cpp \ util/base_model.hpp util/base_model_p.hpp util/base_model.cpp \ util/color_scheme_model.cpp util/color_scheme_model.hpp \ util/color_svg_image_provider.cpp util/color_svg_image_provider.hpp \ @@ -422,6 +425,7 @@ nodist_libqt_plugin_la_SOURCES = \ menus/custom_menus.moc.cpp \ menus/qml_menu_wrapper.moc.cpp \ menus/menus.moc.cpp \ + network/devicesourceprovider.moc.cpp \ network/networkdevicemodel.moc.cpp \ network/networksourcesmodel.moc.cpp \ network/networkmediamodel.moc.cpp \ @@ -440,6 +444,7 @@ nodist_libqt_plugin_la_SOURCES = \ playlist/playlist_model.moc.cpp \ util/asynctask.moc.cpp \ util/audio_device_model.moc.cpp \ + util/workerthreadset.moc.cpp \ util/base_model.moc.cpp \ util/color_scheme_model.moc.cpp \ util/color_svg_image_provider.moc.cpp \ = modules/gui/qt/maininterface/mainctx.cpp = @@ -34,6 +34,7 @@ #include "compositor.hpp" #include "util/renderer_manager.hpp" #include "util/csdbuttonmodel.hpp" +#include "util/workerthreadset.hpp" #include "widgets/native/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget #include "util/qt_dirs.hpp" // toNativeSeparators @@ -522,6 +523,16 @@ inline void MainCtx::initSystray() createSystray(); } +WorkerThreadSet* MainCtx::workersThreads() const +{ +if (!m_workersThreads) +{ +m_workersThreads.reset( new WorkerThreadSet ); +} + +return m_workersThreads.get(); +} + void MainCtx::setMediaLibraryVisible( bool visible ) { if (m_mediaLibraryVisible == visible) = modules/gui/qt/maininterface/mainctx.hpp = @@ -67,6 +67,7 @@ class VideoSurfaceProvider; class ControlbarProfileModel; class SearchCtx; class SortCtx; +class WorkerThreadSet; namespace vlc { namespace playlist { @@ -277,6 +278,8 @@ public: Q_INVOKABLE bool useXmasCone() const; +WorkerThreadSet *workersThreads() const; + protected: /* Systray */ void createSystray(); @@ -354,6 +357,8 @@ protected: SearchCtx* m_search = nullptr; SortCtx* m_sort = nullptr; +mutable std::unique_ptr m_workersThreads; + public slots: void toggleUpdateSystrayMenu(); void showUpdateSystrayMenu(); = modules/gui/qt/meson.build = @@ -102,6 +102,7 @@ moc_headers = files( 'menus/custom_menus.hpp', 'menus/qml_menu_wrapper.hpp', 'menus/menus.hpp', +'network/devicesourceprovider.hpp', 'network/networkdevicemodel.hpp', 'network/networksourcesmodel.hpp', 'network/networkmediamodel.hpp', @@ -120,6 +121,7 @@ moc_headers = files( 'playlist/playlist_model.hpp', 'util/asynctask.hpp', 'util/audio_device_model.hpp', +'util/workerthreadset.hpp', 'util/base_model.hpp', 'util/color_scheme_model.hpp', 'util/color_svg_image_provider.hpp', @@ -363,6 +365,8 @@ some_sources = files( 'menus/menus.hpp', 'network/mediatreelistener.cpp', 'network/mediatreelistener.hpp', +
[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: disable 'view more' panel when there is nothing to show
Steve Lhomme pushed to branch master at VideoLAN / VLC Commits: 8292f955 by Prince Gupta at 2024-06-09T15:19:54+00:00 qml: disable view more panel when there is nothing to show - - - - - fe8ac5c4 by Prince Gupta at 2024-06-09T15:19:54+00:00 qml: simplify description list in VideoInfoExpandList - - - - - 1 changed file: - modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml Changes: = modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml = @@ -218,6 +218,8 @@ FocusScope { text: root._showMoreInfo ? qsTr("View Less") : qsTr("View More") iconTxt: VLCIcons.expand iconRotation: root._showMoreInfo ? -180 : 0 +visible: (root.model.audioDesc?.length > 0) + || (root.model.videoDesc?.length > 0) Behavior on iconRotation { NumberAnimation { @@ -249,91 +251,75 @@ FocusScope { } } -Repeater { -model: [ -{ -"title": qsTr("Video track"), -"model": videoDescModel -}, -{ -"title": qsTr("Audio track"), -"model": audioDescModel -} -] +DescriptionList { +title: qsTr("Video track") -delegate: Column { -visible: delgateRepeater.count > 0 +sourceModel: root.model.videoDesc -Widgets.MenuCaption { -text: modelData.title -color: theme.fg.secondary -font.bold: true -bottomPadding: VLCStyle.margin_small -} +delegateModel: [ +{text: qsTr("Codec:"), role: "codec" }, +{text: qsTr("Language:"), role: "language" }, +{text: qsTr("FPS:"), role: "fps" } +] +} -Repeater { -id: delgateRepeater +DescriptionList { +title: qsTr("Audio track") -model: modelData.model -} -} +sourceModel: root.model.videoDesc + +delegateModel: [ +{text: qsTr("Codec:"), role: "codec" }, +{text: qsTr("Language:"), role: "language" }, +{text: qsTr("Channel:"), role: "nbchannels" } +] } } } } } -ObjectModel { -id: videoDescModel +component DescriptionList : Column { +id: column -Repeater { -model: root.model.videoDesc +property alias title: titleTxt.text -// TODO: use inline Component for Qt > 5.14 -delegate: Repeater { -id: videoDescRepeaterDelegate +property alias sourceModel: sourceRepeater.model -readonly property bool isFirst: (index === 0) +// [["caption": , "role": ].,.] +property var delegateModel -model: [ -{text: qsTr("Codec:"), data: modelData.codec }, -{text: qsTr("Language:"), data: modelData.language }, -{text: qsTr("FPS:"), data: modelData.fps } -] +Widgets.MenuCaption { +id: titleTxt -delegate: Widgets.MenuCaption { -topPadding: (!videoDescRepeaterDelegate.isFirst) && (index === 0) ? VLCStyle.margin_small : 0 -text: modelData.text + " " + modelData.data -color: theme.fg.secondary -bottomPadding: VLCStyle.margin_xsmall -} -} +color: theme.fg.secondary +font.bold: true +bottomPadding: VLCStyle.margin_small } -} - -ObjectModel { -id: audioDescModel -// TODO: use inline Component for Qt > 5.14 Repeater { -model: root.model.audioDesc +id: sourceRepeater delegate: Repeater { -id: audioDescRepeaterDelegate +id: delegateRepeater -readonly property bool isFirst: (index === 0) +model: column.delegateModel -model: [ -
[vlc-commits] [Git][videolan/vlc][master] add missing blank to INPUT_LOWDELAY_LONGTEXT
Steve Lhomme pushed to branch master at VideoLAN / VLC Commits: 3325767f by Olaf Hering at 2024-06-09T14:21:37+00:00 add missing blank to INPUT_LOWDELAY_LONGTEXT Without the blank, the help output reads ... chain.Might Fixes commit 179cfef04a0e3a25b8c03ea8971db654a567256f Signed-off-by: Olaf Hering o...@aepfle.de - - - - - 1 changed file: - src/libvlc-module.c Changes: = src/libvlc-module.c = @@ -678,7 +678,7 @@ static const char *const ppsz_prefres[] = { #define INPUT_LOWDELAY_TEXT N_("Low delay mode") #define INPUT_LOWDELAY_LONGTEXT N_(\ -"Try to minimize delay along decoding chain."\ +"Try to minimize delay along decoding chain. "\ "Might break with non compliant streams.") #define INPUT_REPEAT_TEXT N_("Input repetitions") View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3325767f19267ed77afe84af1e63ed4cb3dd5acd -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3325767f19267ed77afe84af1e63ed4cb3dd5acd 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] 2 commits: demux: adaptive: map VVC
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: e709012f by François Cartegnie at 2024-06-09T11:26:18+00:00 demux: adaptive: map VVC - - - - - 3d080040 by François Cartegnie at 2024-06-09T11:26:18+00:00 demux: adaptive: map CAVS/AVS2/AVS3 - - - - - 1 changed file: - modules/demux/adaptive/tools/FormatNamespace.cpp Changes: = modules/demux/adaptive/tools/FormatNamespace.cpp = @@ -136,6 +136,15 @@ void FormatNamespace::Parse(vlc_fourcc_t fcc, const std::vector fmt.i_level = std::stoi(elements.at(1), nullptr, 16); } break; +case MP4RA("avs1"): +es_format_Change(, VIDEO_ES, VLC_CODEC_CAVS); +break; +case MP4RA("avs2"): +es_format_Change(, VIDEO_ES, VLC_CODEC_CAVS2); +break; +case MP4RA("avs3"): +es_format_Change(, VIDEO_ES, VLC_CODEC_CAVS3); +break; case MP4RA("vp09"): case MP4RA("vp08"): es_format_Change(, VIDEO_ES, @@ -148,6 +157,12 @@ void FormatNamespace::Parse(vlc_fourcc_t fcc, const std::vector fmt.i_level = std::stoi(elements.at(1), nullptr, 16); } break; +case MP4RA("vvc1"): +case MP4RA("vvi1"): +es_format_Change(, VIDEO_ES, VLC_CODEC_VVC); +if(elements.size() > 0) +fmt.i_profile = std::stoi(elements.at(0), nullptr, 16); +break; case MSFCC("AVC1"): case MSFCC("AVCB"): case MSFCC("H264"): View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/804acaed6762e0213ab263fb6e203a185c7a4cb1...3d08004001fe8a1fd5abffcb9f8da93ee6b56226 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/804acaed6762e0213ab263fb6e203a185c7a4cb1...3d08004001fe8a1fd5abffcb9f8da93ee6b56226 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