@@ -1,86 +0,0 @@

-•/*****************************************************************************

- * Copyright (C) 2019 VLC authors and VideoLAN

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * ( at your option ) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.

- *****************************************************************************/

-

-pragma Singleton

-

-import QtQml

-

-import org.videolan.vlc 0.1

-

-import "qrc:///player/controlbarcontrols/" as Controls

-import "qrc:///widgets/" as Widgets

-import "qrc:///style/"

-

-QtObject {

-    readonly property string controlPath : "qrc:///player/controlbarcontrols/"

-

-    readonly property var controlList: 

-        { id: ControlListModel.PLAY_BUTTON, file: "PlayButton.qml", label: VLCIcons.play_filled, text: qsTr("Play") },

-        { id: ControlListModel.STOP_BUTTON, file: "StopButton.qml", label: VLCIcons.stop, text: qsTr("Stop") },

-        { id: ControlListModel.OPEN_BUTTON, file: "OpenButton.qml", label: VLCIcons.eject, text: qsTr("Open") },

-        { id: ControlListModel.PREVIOUS_BUTTON, file: "PreviousButton.qml", label: VLCIcons.previous, text: qsTr("Previous") },

-        { id: ControlListModel.NEXT_BUTTON, file: "NextButton.qml", label: VLCIcons.next, text: qsTr("Next") },

-        { id: ControlListModel.SLOWER_BUTTON, file: "SlowerButton.qml", label: VLCIcons.slower, text: qsTr("Slower") },

-        { id: ControlListModel.FASTER_BUTTON, file: "FasterButton.qml", label: VLCIcons.faster, text: qsTr("Faster") },

-        { id: ControlListModel.FULLSCREEN_BUTTON, file: "FullscreenButton.qml", label: VLCIcons.fullscreen, text: qsTr("Fullscreen") },

-        { id: ControlListModel.EXTENDED_BUTTON, file: "ExtendedSettingsButton.qml", label: VLCIcons.effect_filter, text: qsTr("Extended panel") },

-        { id: ControlListModel.PLAYLIST_BUTTON, file: "PlaylistButton.qml", label: VLCIcons.playlist, text: qsTr("Playlist") },

-        { id: ControlListModel.SNAPSHOT_BUTTON, file: "SnapshotButton.qml", label: VLCIcons.snapshot, text: qsTr("Snapshot") },

-        { id: ControlListModel.RECORD_BUTTON, file: "RecordButton.qml", label: VLCIcons.record, text: qsTr("Record") },

-        { id: ControlListModel.ATOB_BUTTON, file: "AtoBButton.qml", label: VLCIcons.atob, text: qsTr("A-B Loop") },

-        { id: ControlListModel.FRAME_BUTTON, file: "FrameButton.qml", label: VLCIcons.frame_by_frame, text: qsTr("Frame By Frame") },

-        { id: ControlListModel.REVERSE_BUTTON, file: "ReverseButton.qml", label: VLCIcons.play_reverse, text: qsTr("Trickplay Reverse") },

-        { id: ControlListModel.SKIP_BACK_BUTTON, file: "SkipBackButton.qml", label: VLCIcons.skip_back, text: qsTr("Step backward") },

-        { id: ControlListModel.SKIP_FW_BUTTON, file: "SkipForwardButton.qml", label: VLCIcons.skip_for, text: qsTr("Step forward") },

-        { id: ControlListModel.QUIT_BUTTON, file: "QuitButton.qml", label: VLCIcons.clear, text: qsTr("Quit") },

-        { id: ControlListModel.RANDOM_BUTTON, file: "RandomButton.qml", label: VLCIcons.shuffle, text: qsTr("Random") },

-        { id: ControlListModel.LOOP_BUTTON, file: "LoopButton.qml", label: VLCIcons.repeat_all, text: qsTr("Loop") },

-        { id: ControlListModel.INFO_BUTTON, file: "InfoButton.qml", label: VLCIcons.info, text: qsTr("Information") },

-        { id: ControlListModel.LANG_BUTTON, file: "LangButton.qml", label: VLCIcons.audiosub, text: qsTr("Open subtitles") },

-        { id: ControlListModel.BOOKMARK_BUTTON, file: "BookmarkButton.qml", label: VLCIcons.bookmark, text: qsTr("Bookmark Button") },

-        { id: ControlListModel.CHAPTER_PREVIOUS_BUTTON, file: "ChapterPreviousButton.qml", label: VLCIcons.dvd_prev, text: qsTr("Previous chapter") },

-        { id: ControlListModel.CHAPTER_NEXT_BUTTON, file: "ChapterNextButton.qml", label: VLCIcons.dvd_next, text: qsTr("Next chapter") },

-        { id: ControlListModel.VOLUME, file: "VolumeWidget.qml", label: VLCIcons.volume_high, text: qsTr("Volume Widget") },

-        { id: ControlListModel.NAVIGATION_BOX, file: "NavigationBoxButton.qml", label: VLCIcons.ic_fluent_arrow_move, text: qsTr("Navigation Box") },

-        { id: ControlListModel.NAVIGATION_BUTTONS, file: "NavigationWidget.qml", label: VLCIcons.dvd_menu, text: qsTr("Navigation") },

-        { id: ControlListModel.DVD_MENUS_BUTTON, file: "DvdMenuButton.qml", label: VLCIcons.dvd_menu, text: qsTr("DVD menus") },

-        { id: ControlListModel.PROGRAM_BUTTON, file: "ProgramButton.qml", label: VLCIcons.tv, text: qsTr("Program Button") },

-        { id: ControlListModel.TELETEXT_BUTTONS, file: "TeletextButton.qml", label: VLCIcons.tvtelx, text: qsTr("Teletext") },

-        { id: ControlListModel.RENDERER_BUTTON, file: "RendererButton.qml", label: VLCIcons.renderer, text: qsTr("Renderer Button") },

-        { id: ControlListModel.ASPECT_RATIO_COMBOBOX, file: "AspectRatioWidget.qml", label: VLCIcons.aspect_ratio, text: qsTr("Aspect Ratio") },

-        { id: ControlListModel.WIDGET_SPACER, file: "SpacerWidget.qml", label: VLCIcons.space, text: qsTr("Spacer") },

-        { id: ControlListModel.WIDGET_SPACER_EXTEND, file: "ExpandingSpacerWidget.qml", label: VLCIcons.space, text: qsTr("Expanding Spacer") },

-        { id: ControlListModel.PLAYER_SWITCH_BUTTON, file: "PlayerSwitchButton.qml", label: VLCIcons.fullscreen, text: qsTr("Switch Player") },

-        { id: ControlListModel.ARTWORK_INFO, file: "ArtworkInfoWidget.qml", label: VLCIcons.info, text: qsTr("Artwork Info") },

-        { id: ControlListModel.PLAYBACK_SPEED_BUTTON, file: "PlaybackSpeedButton.qml", label: "1x", text: qsTr("Playback Speed") },

-        { id: ControlListModel.HIGH_RESOLUTION_TIME_WIDGET, file: "HighResolutionTimeWidget.qml", label: VLCIcons.info, text: qsTr("High Resolution Time") }

-    

-

-    function control(id) {

-        const entry = controlList.find( function(e) { return ( e.id === id ) } )

-

-        if (entry === undefined) {

-            console.log("control delegate id " + id +  " doesn't exist")

-            return { source: controlPath + "Fallback.qml" }

-        }

-

-        entry.source = controlPath + entry.file

-

-        return entry

-    }

-}

​

@@ -1,1 +0,0 @@

-singleton PlayerControlbarControls ControlbarControls.qml

​

@@ -1,259 +0,0 @@

-<?xml version="1.0"?>

-<RCC>

-    <qresource prefix="/util">

-        <file alias="Helpers.js">util/qml/Helpers.js</file>

-        <file alias="ModelSortSettingHandler.qml">util/qml/ModelSortSettingHandler.qml</file>

-        <file alias="FlickableScrollHandler.qml">util/qml/FlickableScrollHandler.qml</file>

-        <file alias="ViewDragAutoScrollHandler.qml">util/qml/ViewDragAutoScrollHandler.qml</file>

-        <file alias="NativeMenu.qml">util/qml/NativeMenu.qml</file>

-        <file alias="MLContextMenu.qml">util/qml/MLContextMenu.qml</file>

-        <file alias="FSM.qml">util/qml/FSM.qml</file>

-        <file alias="FSMState.qml">util/qml/FSMState.qml</file>

-        <file alias="FadeControllerStateGroup.qml">util/qml/FadeControllerStateGroup.qml</file>

-        <file alias="GridSizeHelper.qml">util/qml/GridSizeHelper.qml</file>

-    </qresource>

-    <qresource prefix="/main">

-        <file alias="BannerSources.qml">maininterface/qml/BannerSources.qml</file>

-        <file alias="MainInterface.qml">maininterface/qml/MainInterface.qml</file>

-        <file alias="MainDisplay.qml">maininterface/qml/MainDisplay.qml</file>

-        <file alias="NoMedialibHome.qml">maininterface/qml/NoMedialibHome.qml</file>

-        <file alias="MainTableView.qml">maininterface/qml/MainTableView.qml</file>

-        <file alias="MainGridView.qml">maininterface/qml/MainGridView.qml</file>

-        <file alias="MainViewLoader.qml">maininterface/qml/MainViewLoader.qml</file>

-    </qresource>

-    <qresource prefix="/widgets">

-        <file alias="LabelExt.qml">widgets/qml/LabelExt.qml</file>

-        <file alias="EmptyLabel.qml">widgets/qml/EmptyLabel.qml</file>

-        <file alias="EmptyLabelButton.qml">widgets/qml/EmptyLabelButton.qml</file>

-        <file alias="EmptyLabelHint.qml">widgets/qml/EmptyLabelHint.qml</file>

-        <file alias="ActionButtonOverlay.qml">widgets/qml/ActionButtonOverlay.qml</file>

-        <file alias="ActionButtonPrimary.qml">widgets/qml/ActionButtonPrimary.qml</file>

-        <file alias="BannerCone.qml">widgets/qml/BannerCone.qml</file>

-        <file alias="BannerTabButton.qml">widgets/qml/BannerTabButton.qml</file>

-        <file alias="BusyIndicatorExt.qml">widgets/qml/BusyIndicatorExt.qml</file>

-        <file alias="AcrylicBackground.qml">widgets/qml/AcrylicBackground.qml</file>

-        <file alias="AnimatedBackground.qml">widgets/qml/AnimatedBackground.qml</file>

-        <file alias="CheckButton.qml">widgets/qml/CheckButton.qml</file>

-        <file alias="CSDWindowButton.qml">widgets/qml/CSDWindowButton.qml</file>

-        <file alias="CSDWindowButtonSet.qml">widgets/qml/CSDWindowButtonSet.qml</file>

-        <file alias="CSDTitlebarTapNDrapHandler.qml">widgets/qml/CSDTitlebarTapNDrapHandler.qml</file>

-        <file alias="CSDMouseStealer.qml">widgets/qml/CSDMouseStealer.qml</file>

-        <file alias="TrackDelayButton.qml">widgets/qml/TrackDelayButton.qml</file>

-        <file alias="CurrentIndicator.qml">widgets/qml/CurrentIndicator.qml</file>

-        <file alias="GridItem.qml">widgets/qml/GridItem.qml</file>

-        <file alias="DrawerExt.qml">widgets/qml/DrawerExt.qml</file>

-        <file alias="KeyNavigableListView.qml">widgets/qml/KeyNavigableListView.qml</file>

-        <file alias="KeyNavigableTableView.qml">widgets/qml/KeyNavigableTableView.qml</file>

-        <file alias="TableViewDelegate.qml">widgets/qml/TableViewDelegate.qml</file>

-        <file alias="TableColumns.qml">widgets/qml/TableColumns.qml</file>

-        <file alias="MLTableColumns.qml">widgets/qml/MLTableColumns.qml</file>

-        <file alias="TableHeaderDelegate.qml">widgets/qml/TableHeaderDelegate.qml</file>

-        <file alias="TableRowDelegate.qml">widgets/qml/TableRowDelegate.qml</file>

-        <file alias="ImageToolButton.qml">widgets/qml/ImageToolButton.qml</file>

-        <file alias="TextToolButton.qml">widgets/qml/TextToolButton.qml</file>

-        <file alias="IconToolButton.qml">widgets/qml/IconToolButton.qml</file>

-        <file alias="IconTrackButton.qml">widgets/qml/IconTrackButton.qml</file>

-        <file alias="StackViewExt.qml">widgets/qml/StackViewExt.qml</file>

-        <file alias="ComboBoxExt.qml">widgets/qml/ComboBoxExt.qml</file>

-        <file alias="SpinBoxExt.qml">widgets/qml/SpinBoxExt.qml</file>

-        <file alias="ExpandGridView.qml">widgets/qml/ExpandGridView.qml</file>

-        <file alias="ScanProgressBar.qml">widgets/qml/ScanProgressBar.qml</file>

-        <file alias="SearchBox.qml">widgets/qml/SearchBox.qml</file>

-        <file alias="SortControl.qml">widgets/qml/SortControl.qml</file>

-        <file alias="RoundButton.qml">widgets/qml/RoundButton.qml</file>

-        <file alias="VideoQualityLabels.qml">widgets/qml/VideoQualityLabels.qml</file>

-        <file alias="VideoProgressBar.qml">widgets/qml/VideoProgressBar.qml</file>

-        <file alias="NavigableCol.qml">widgets/qml/NavigableCol.qml</file>

-        <file alias="NavigableRow.qml">widgets/qml/NavigableRow.qml</file>

-        <file alias="ButtonExt.qml">widgets/qml/ButtonExt.qml</file>

-        <file alias="TextAutoScroller.qml">widgets/qml/TextAutoScroller.qml</file>

-        <file alias="CaptionLabel.qml">widgets/qml/CaptionLabel.qml</file>

-        <file alias="IconLabel.qml">widgets/qml/IconLabel.qml</file>

-        <file alias="ListLabel.qml">widgets/qml/ListLabel.qml</file>

-        <file alias="SubtitleLabel.qml">widgets/qml/SubtitleLabel.qml</file>

-        <file alias="PlayCover.qml">widgets/qml/PlayCover.qml</file>

-        <file alias="MenuCaption.qml">widgets/qml/MenuCaption.qml</file>

-        <file alias="MediaCover.qml">widgets/qml/MediaCover.qml</file>

-        <file alias="MenuLabel.qml">widgets/qml/MenuLabel.qml</file>

-        <file alias="ListSubtitleLabel.qml">widgets/qml/ListSubtitleLabel.qml</file>

-        <file alias="HorizontalResizeHandle.qml">widgets/qml/HorizontalResizeHandle.qml</file>

-        <file alias="PointingTooltip.qml">widgets/qml/PointingTooltip.qml</file>

-        <file alias="FrostedGlassEffect.qml">widgets/qml/FrostedGlassEffect.qml</file>

-        <file alias="CheckedDelegate.qml">widgets/qml/CheckedDelegate.qml</file>

-        <file alias="PageLoader.qml">widgets/qml/PageLoader.qml</file>

-        <file alias="LocalTabBar.qml">widgets/qml/LocalTabBar.qml</file>

-        <file alias="IconButton.qml">widgets/qml/IconButton.qml</file>

-        <file alias="DragItem.qml">widgets/qml/DragItem.qml</file>

-        <file alias="DefaultShadow.qml">widgets/qml/DefaultShadow.qml</file>

-        <file alias="OverlayMenu.qml">widgets/qml/OverlayMenu.qml</file>

-        <file alias="ToolTipExt.qml">widgets/qml/ToolTipExt.qml</file>

-        <file alias="MLDragItem.qml">widgets/qml/MLDragItem.qml</file>

-        <file alias="ScaledImage.qml">widgets/qml/ScaledImage.qml</file>

-        <file alias="DropShadowImage.qml">widgets/qml/DropShadowImage.qml</file>

-        <file alias="DoubleShadow.qml">widgets/qml/DoubleShadow.qml</file>

-        <file alias="CSDThemeButtonSet.qml">widgets/qml/CSDThemeButtonSet.qml</file>

-        <file alias="CSDThemeButton.qml">widgets/qml/CSDThemeButton.qml</file>

-        <file alias="TextFieldExt.qml">widgets/qml/TextFieldExt.qml</file>

-        <file alias="SliderExt.qml">widgets/qml/SliderExt.qml</file>

-        <file alias="FadingEdge.qml">widgets/qml/FadingEdge.qml</file>

-        <file alias="FadingEdgeForListView.qml">widgets/qml/FadingEdgeForListView.qml</file>

-        <file alias="PopupIconToolButton.qml">widgets/qml/PopupIconToolButton.qml</file>

-        <file alias="PartialEffect.qml">widgets/qml/PartialEffect.qml</file>

-        <file alias="ViewHeader.qml">widgets/qml/ViewHeader.qml</file>

-        <file alias="ProgressIndicator.qml">widgets/qml/ProgressIndicator.qml</file>

-        <file alias="ExpandGridItemView.qml">widgets/qml/ExpandGridItemView.qml</file>

-    </qresource>

-    <qresource prefix="/network">

-        <file alias="AddressbarButton.qml">network/qml/AddressbarButton.qml</file>

-        <file alias="BrowseDeviceView.qml">network/qml/BrowseDeviceView.qml</file>

-        <file alias="BrowseDisplay.qml">network/qml/BrowseDisplay.qml</file>

-        <file alias="BrowseHomeDisplay.qml">network/qml/BrowseHomeDisplay.qml</file>

-        <file alias="BrowseTreeDisplay.qml">network/qml/BrowseTreeDisplay.qml</file>

-        <file alias="BrowseTreeHeader.qml">network/qml/BrowseTreeHeader.qml</file>

-        <file alias="DiscoverDisplay.qml">network/qml/DiscoverDisplay.qml</file>

-        <file alias="DiscoverUrlDisplay.qml">network/qml/DiscoverUrlDisplay.qml</file>

-        <file alias="NetworkCustomCover.qml">network/qml/NetworkCustomCover.qml</file>

-        <file alias="NetworkGridItem.qml">network/qml/NetworkGridItem.qml</file>

-        <file alias="NetworkThumbnailItem.qml">network/qml/NetworkThumbnailItem.qml</file>

-        <file alias="NetworkAddressbar.qml">network/qml/NetworkAddressbar.qml</file>

-        <file alias="ServicesHomeDisplay.qml">network/qml/ServicesHomeDisplay.qml</file>

-        <file alias="ServicesManage.qml">network/qml/ServicesManage.qml</file>

-        <file alias="ServicesSources.qml">network/qml/ServicesSources.qml</file>

-    </qresource>

-    <qresource prefix="/medialibrary">

-        <file alias="MediaGroupDisplay.qml">medialibrary/qml/MediaGroupDisplay.qml</file>

-        <file alias="MusicAlbums.qml">medialibrary/qml/MusicAlbums.qml</file>

-        <file alias="MusicDisplay.qml">medialibrary/qml/MusicDisplay.qml</file>

-        <file alias="MusicGenres.qml">medialibrary/qml/MusicGenres.qml</file>

-        <file alias="VideoDisplay.qml">medialibrary/qml/VideoDisplay.qml</file>

-        <file alias="VideoAll.qml">medialibrary/qml/VideoAll.qml</file>

-        <file alias="VideoAllDisplay.qml">medialibrary/qml/VideoAllDisplay.qml</file>

-        <file alias="VideoAllSubDisplay.qml">medialibrary/qml/VideoAllSubDisplay.qml</file>

-        <file alias="PlaylistMediaList.qml">medialibrary/qml/PlaylistMediaList.qml</file>

-        <file alias="PlaylistMedia.qml">medialibrary/qml/PlaylistMedia.qml</file>

-        <file alias="PlaylistMediaDisplay.qml">medialibrary/qml/PlaylistMediaDisplay.qml</file>

-        <file alias="VideoPlaylistsDisplay.qml">medialibrary/qml/VideoPlaylistsDisplay.qml</file>

-        <file alias="MusicAlbumsDisplay.qml">medialibrary/qml/MusicAlbumsDisplay.qml</file>

-        <file alias="MusicAlbumsGridExpandDelegate.qml">medialibrary/qml/MusicAlbumsGridExpandDelegate.qml</file>

-        <file alias="MusicArtist.qml">medialibrary/qml/MusicArtist.qml</file>

-        <file alias="MusicArtistDelegate.qml">medialibrary/qml/MusicArtistDelegate.qml</file>

-        <file alias="MusicArtistsAlbums.qml">medialibrary/qml/MusicArtistsAlbums.qml</file>

-        <file alias="MusicAllArtists.qml">medialibrary/qml/MusicAllArtists.qml</file>

-        <file alias="MusicArtistsDisplay.qml">medialibrary/qml/MusicArtistsDisplay.qml</file>

-        <file alias="MusicGenresDisplay.qml">medialibrary/qml/MusicGenresDisplay.qml</file>

-        <file alias="MusicPlaylistsDisplay.qml">medialibrary/qml/MusicPlaylistsDisplay.qml</file>

-        <file alias="MusicTracksDisplay.qml">medialibrary/qml/MusicTracksDisplay.qml</file>

-        <file alias="MusicTrackListDisplay.qml">medialibrary/qml/MusicTrackListDisplay.qml</file>

-        <file alias="ArtistTopBanner.qml">medialibrary/qml/ArtistTopBanner.qml</file>

-        <file alias="UrlListDisplay.qml">medialibrary/qml/UrlListDisplay.qml</file>

-        <file alias="VideoInfoExpandPanel.qml">medialibrary/qml/VideoInfoExpandPanel.qml</file>

-        <file alias="VideoListDisplay.qml">medialibrary/qml/VideoListDisplay.qml</file>

-        <file alias="VideoGridItem.qml">medialibrary/qml/VideoGridItem.qml</file>

-        <file alias="AudioGridItem.qml">medialibrary/qml/AudioGridItem.qml</file>

-        <file alias="VideoRecentVideos.qml">medialibrary/qml/VideoRecentVideos.qml</file>

-        <file alias="VideoGridDisplay.qml">medialibrary/qml/VideoGridDisplay.qml</file>

-        <file alias="VideoRecentVideosDisplay.qml">medialibrary/qml/VideoRecentVideosDisplay.qml</file>

-    </qresource>

-    <qresource prefix="/style">

-        <file alias="AcrylicController.qml">style/AcrylicController.qml</file>

-        <file alias="qmldir">style/qmldir</file>

-        <file alias="VLCStyle.qml">style/VLCStyle.qml</file>

-        <file alias="VLCIcons.qml">style/VLCIcons.qml</file>

-    </qresource>

-    <qresource prefix="/playlist">

-        <file alias="PlaylistDelegate.qml">playlist/qml/PlaylistDelegate.qml</file>

-        <file alias="PlaylistListView.qml">playlist/qml/PlaylistListView.qml</file>

-        <file alias="PlaylistToolbar.qml">playlist/qml/PlaylistToolbar.qml</file>

-        <file alias="PlaylistDetachedWindow.qml">playlist/qml/PlaylistDetachedWindow.qml</file>

-    </qresource>

-    <qresource prefix="/menus">

-        <file alias="Menubar.qml">menus/qml/Menubar.qml</file>

-        <file alias="GlobalShortcuts.qml">menus/qml/GlobalShortcuts.qml</file>

-        <file alias="GlobalShortcutsMedialib.qml">menus/qml/GlobalShortcutsMedialib.qml</file>

-        <file alias="ShortcutExt.qml">menus/qml/ShortcutExt.qml</file>

-    </qresource>

-    <qresource prefix="/player">

-        <file alias="qmldir">player/qml/qmldir</file>

-        <file alias="Player.qml">player/qml/Player.qml</file>

-        <file alias="ControlBar.qml">player/qml/ControlBar.qml</file>

-        <file alias="ResumeDialog.qml">player/qml/ResumeDialog.qml</file>

-        <file alias="SliderBar.qml">player/qml/SliderBar.qml</file>

-        <file alias="TracksMenu.qml">player/qml/TracksMenu.qml</file>

-        <file alias="TracksPage.qml">player/qml/TracksPage.qml</file>

-        <file alias="TracksPageSpeed.qml">player/qml/TracksPageSpeed.qml</file>

-        <file alias="TracksPageAudio.qml">player/qml/TracksPageAudio.qml</file>

-        <file alias="TracksPageSubtitle.qml">player/qml/TracksPageSubtitle.qml</file>

-        <file alias="TracksListPage.qml">player/qml/TracksListPage.qml</file>

-        <file alias="ControlbarControls.qml">player/qml/ControlbarControls.qml</file>

-        <file alias="MiniPlayer.qml">player/qml/MiniPlayer.qml</file>

-        <file alias="TopBar.qml">player/qml/TopBar.qml</file>

-        <file alias="PIPPlayer.qml">player/qml/PIPPlayer.qml</file>

-        <file alias="PlayerControlLayout.qml">player/qml/PlayerControlLayout.qml</file>

-        <file alias="ControlLayout.qml">player/qml/ControlLayout.qml</file>

-        <file alias="ControlRepeater.qml">player/qml/ControlRepeater.qml</file>

-        <file alias="PlaybackSpeed.qml">player/qml/PlaybackSpeed.qml</file>

-        <file alias="PlayerPlaylistVisibilityFSM.qml">player/qml/PlayerPlaylistVisibilityFSM.qml</file>

-        <file alias="PlayerBlurredBackground.qml">player/qml/PlayerBlurredBackground.qml</file>

-        <file alias="Bookmarks.qml">player/qml/Bookmarks.qml</file>

-        <file alias="NavigationBox.qml">player/qml/NavigationBox.qml</file>

-    </qresource>

​

@@ -1,3 +0,0 @@

-singleton VLCStyle VLCStyle.qml

-singleton VLCIcons VLCIcons.qml

-singleton AcrylicController AcrylicController.qml

​

@@ -1,126 +0,0 @@

-/*****************************************************************************

- * Copyright (C) 2021 VLC authors and VideoLAN

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * ( at your option ) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.

- *****************************************************************************/

-

-.pragma library

-

-function clamp(num, min, max) {

-  return num <= min ? min : num >= max ? max : num;

-}

-

-function isValidInstanceOf(object, type) {

-    return (!!object && (object instanceof type))

-}

-

-// NOTE: This allows us to force another 'reason' even when the item has activeFocus.

-function enforceFocus(item, reason) {

-    if (item.activeFocus && item.focusReason === reason)

-        return

-

-    item.focus = false;

-

-    item.forceActiveFocus(reason);

-}

-

-function applyVolume(player, delta) {

-    // Degrees to steps for standard mouse

-    delta = delta / 8 / 15

-

-    const steps = Math.ceil(Math.abs(delta))

-

-    player.muted = false

-

-    if (delta > 0)

-        player.setVolumeUp(steps)

-    else

-        player.setVolumeDown(steps)

-}

-

-function pointInRadius(x, y, radius) {

-     return (x * x + y * y < radius * radius)

-}

-

-// checks if point `pos` lies in rect `rect`

-function contains(rect, pos) {

-    return (clamp(pos.x, rect.x, rect.x + rect.width) === pos.x)

-            && (clamp(pos.y, rect.y, rect.y + rect.height) === pos.y)

-}

-

-function isInteger(data) {

-    return (typeof data === 'number' && (data % 1) === 0)

-}

-

-function compareFloat(a, b) {

-    return (Math.abs(a - b) < Number.EPSILON)

-}

-

-function alignUp(a, b) {

-    return Math.ceil(a / b) * b

-}

-

-function alignDown(a, b) {

-    return Math.floor(a / b) * b

-}

-

-function isSortedIntegerArrayConsecutive(array) {

-    for (let i = 1; i < array.length; ++i) {

-        if ((arrayi - arrayi - 1) !== 1)

-            return false

-    }

-

-    return true

-}

-

-function itemsMovable(sortedItemIndexes, targetIndex) {

-    return !isSortedIntegerArrayConsecutive(sortedItemIndexes) ||

-            (targetIndex > (sortedItemIndexessortedItemIndexes.length - 1 + 1) ||

-             targetIndex < sortedItemIndexes0)

-}

-

-/**

- * calculate content y for flickable such that item with given param will be fully visible

- * @param type:Flickable flickable

- * @param type:real y

- * @param type:real height

- * @param type:real topMargin

- * @param type:real bottomMargin

- * @return type:real appropriate contentY for flickable

- */

-function flickablePositionContaining(flickable, y, height, topMargin, bottomMargin) {

-    const itemTopY = flickable.originY + y

-    const itemBottomY = itemTopY + height

-

-    const viewTopY = flickable.contentY

-    const viewBottomY = viewTopY + flickable.height

-

-    let newContentY

-

-    if (itemTopY < viewTopY)

-         //item above view

-        newContentY = itemTopY - topMargin

-    else if (itemBottomY > viewBottomY)

-         //item below view

-        newContentY = itemBottomY + bottomMargin - flickable.height

-    else

-        newContentY = flickable.contentY

-

-    return newContentY

-}

-

-function isArray(obj) {

-    return (obj?.length !== undefined) ?? false

-}

​

@@ -1890,23 +1890,105 @@

   AS_HELP_STRING(--enable-rust,

     enable building Rust modules (default disabled)))

 AS_IF(test "${enable_rust}" = "yes",

+

+  rust_target_flags=

+  AS_IF(test "$vlc_winstore_app" = "1",

+    rust_target_flags="${rust_target_flags} --uwp"

+  )

+  AS_IF(test "${win_ucrt_build}" = "yes",

+    rust_target_flags="${rust_target_flags} --ucrt"

+  )

+  AS_IF(test "${HAVE_TVOS}" = "1",

+    rust_target_flags="${rust_target_flags} --darwin=tvos"

+  ,

+    AS_IF(test "${HAVE_WATCHOS}" = "1",

+      rust_target_flags="${rust_target_flags} --darwin=watchos"

+    ,

+      AS_IF(test "${HAVE_XROS}" = "1",

+        rust_target_flags="${rust_target_flags} --darwin=xros"

+      ,

+        AS_IF(test "${HAVE_IOS}" = "1",

+          rust_target_flags="${rust_target_flags} --darwin=ios"

+        ,

+          AS_IF(test "${HAVE_OSX}" = "1",

+            rust_target_flags="${rust_target_flags} --darwin=macos"

+          )

+        )

+      )

+    )

+  )

+

+  AC_MSG_CHECKING(Rust target)

+  rust_target=$(${srcdir}/contrib/src/get-rust-target.sh \

+    ${rust_target_flags} \

+    ${host})

+  ac_status=$?

+  AS_IF(test $ac_status = 0,

+    AC_MSG_RESULT(${rust_target})

+    AC_SUBST(RUST_TARGET, "${rust_target}")

+  ,

+    AC_MSG_RESULT(unsupported)

+    AC_MSG_ERROR(Unsupported Rust target for ${host})

+  )

+

+  AS_IF(test -z "${CARGO_HOME}" -a "${host}" != "${build}",

+    AC_MSG_CHECKING(CARGO_HOME from contribs)

+    AS_IF(test -d "${CONTRIB_DIR}/../bin/.cargo",

+      CARGO_HOME=$(cd "${CONTRIB_DIR}/../bin/.cargo" && pwd -P)

+      AC_MSG_RESULT(${CARGO_HOME})

+    ,

+      AC_MSG_RESULT(not found)

+    )

+  )

+

+  RUST_ENV=

+  AS_IF(test -n "${CARGO_HOME}",

+    RUST_ENV="${RUST_ENV} CARGO_HOME=\"${CARGO_HOME}\""

+    AS_IF(test -x "${CARGO_HOME}/bin/cargo",

+      ac_cv_prog_CARGO="${CARGO_HOME}/bin/cargo"

+    )

+    AS_IF(test -x "${CARGO_HOME}/bin/rustc",

+      ac_cv_prog_RUSTC="${CARGO_HOME}/bin/rustc"

+    )

+  )

+

+  AS_IF(test "${host}" != "${build}",

+    dnl RUSTUP_HOME is needed to cross-compile Rust

+    AS_IF(test -z "${RUSTUP_HOME}",

+      AC_MSG_CHECKING(RUSTUP_HOME from contribs)

+      AS_IF(test -d "${CONTRIB_DIR}/../bin/.rustup",

+        RUSTUP_HOME=$(cd "${CONTRIB_DIR}/../bin/.rustup" && pwd -P)

+        AC_MSG_RESULT(${RUSTUP_HOME})

+      ,

+        AC_MSG_RESULT(not found)

+      )

+    )

+  )

+

+  AS_IF(test -n "${RUSTUP_HOME}",

+    RUST_ENV="${RUST_ENV} RUSTUP_HOME=\"${RUSTUP_HOME}\""

+  )

+

   AC_CHECK_PROGS(RUSTC, rustc, no)

   AS_IF(test "$RUSTC" = "no",

     AC_MSG_ERROR(rustc not found but required to build Rust modules)

   )

-  AS_IF(test "${host}" = "${build}",

-    AC_CACHE_CHECK(rustc host target, ac_cv_rustc_host_target,

-                     ac_cv_rustc_host_target=$($RUSTC --verbose --version | grep "host:" | cut -d" " -f2-))

-    AS_IF(test -n "${ac_cv_rustc_host_target}",

-           AC_SUBST(RUST_TARGET, "$ac_cv_rustc_host_target"),

-           AC_MSG_ERROR(failed to extract rustc host target))

+

+  AC_MSG_CHECKING(Rust compiler supports ${rust_target})

+  ac_try="echo 'fn main() {}' | ${RUST_ENV} \"${RUSTC}\" --target=${rust_target} --emit=dep-info - -o -"

+  (eval "$ac_try") 2>&5

+  ac_status=$?

+  AS_IF(test $ac_status = 0,

+    AC_MSG_RESULT(yes)

   ,

-    AC_MSG_ERROR(cross compilation is not yet supported for Rust modules (${host} != ${build}))

+    AC_MSG_RESULT(no)

+    AC_MSG_ERROR(Required target ${rust_target} missing (using ${RUST_ENV}))

   )

   AC_CHECK_PROGS(CARGO, cargo, no)

   AS_IF(test "$CARGO" = "no",

     AC_MSG_ERROR(cargo not found. cargo is required to build Rust modules)

   )

+  AC_SUBST(RUST_ENV)

   AC_DEFINE(ENABLE_RUST, 1, Define to 1 for building rust modules.)

 )

 AM_CONDITIONAL(HAVE_RUST, test "${enable_rust}" = "yes")

@@ -4212,6 +4294,7 @@

 AM_CONDITIONAL(HAVE_QT_GUI_PRIVATE, test "${have_qt_gui_private}" = "yes")

 AM_CONDITIONAL(HAVE_QT_CORE_PRIVATE, test "${have_qt_core_private}" = "yes")

 AM_CONDITIONAL(HAVE_FXC, test "${have_fxc}" = "yes")

+AM_CONDITIONAL(HAVE_QT67, test "${QT_VERSION_MAJ}" -gt "6" || (test "${QT_VERSION_MAJ}" = "6" && test "${QT_VERSION_MIN}" -ge "7"))

 dnl

 dnl detect kde4-config patch (used for kde solids).

​

@@ -296,6 +296,10 @@

        then

            add_make_enabled "HAVE_BITCODE_ENABLED"

        fi

+       if test "$BUILDFORSIMULATOR"

+       then

+           add_make_enabled "HAVE_SIMULATOR"

+       fi

        ;;

    *bsd*)

        MAKE=gmake

​

@@ -3,7 +3,7 @@

 CARGOC_VERSION := 0.9.29

 ifdef BUILD_RUST

-PKGS_TOOLS += cargo-c

+# PKGS_TOOLS += cargo-c

 ifneq ($(call system_tool_majmin, cargo-capi --version),)

 PKGS_FOUND += cargo-c

@@ -11,11 +11,7 @@

 endif

-ifdef HAVE_CROSS_COMPILE

-DEPS_cargo-c = rustc-cross $(DEPS_rustc-cross)

-else

 DEPS_cargo-c = rustc $(DEPS_rustc)

-endif

 .sum-cargo-c:

    touch $@

@@ -32,5 +28,5 @@

 .cargo-c:

    +unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \

-       $(CARGO) install --locked $(CARGOC_FEATURES) cargo-c --version $(CARGOC_VERSION)

+       $(CARGO_NATIVE) install --target=$(RUST_HOST) --locked $(CARGOC_FEATURES) cargo-c --version $(CARGOC_VERSION)

    touch $@

​

@@ -0,0 +1,215 @@

+#!/bin/sh

+# SPDX-License-Identifier: ISC

+# Copyright (C) 2024 VideoLabs, VLC authors and VideoLAN

+#

+# Authors: Denis Charmet <typx@dinauz.org>

+#          Steve Lhomme <robux4@videolabs.io>

+#

+# Transform a compilation triplet into a Rust Tier 1 and Tier 2 target

+# based on https://doc.rust-lang.org/rustc/platform-support.html

+

+DARWIN=

+ARCH=

+OS=

+UWP=

+UCRT=

+SIMULATOR=

+TRIPLET=

+

+abort_err()

+{

+    echo "ERROR: $1" >&2

+    exit 1

+}

+

+return_triplet()

+{

+  echo "$1"

+  exit 0

+}

+

+validate_darwin()

+{

+  D=$(echo $1 | cut -f2 -d"=")

+  case $D in

+    macos)

+      DARWIN=macos

+      ;;

+    ios)

+      DARWIN=ios

+      ;;

+    tvos)

+      DARWIN=tvos

+      ;;

+    watchos)

+      DARWIN=watchos

+      ;;

+    xros)

+      DARWIN=xros

+      ;;

+    *)

+      abort_err "Unsupported Darwin variant '$D'"

+      ;;

+  esac

+}

+

+validate_triplet()

+{

+  TRIPLET=$1

+  ARCH=$(echo $1 | cut -f 1 -d '-')

+  UNUSED=$(echo $1 | cut -f 2 -d '-')

+  OS=$(echo $1 | cut -f 3 -d '-')

+  REST=$(echo $1 | cut -f 4 -d '-')

+

+  if test ! -z "$REST"; then

+    OS=$REST

+  fi

+  if test -z "$ARCH" || test -z "$UNUSED" || test -z "$OS"; then

+    abort_err "Unsupported triplet '$1'"

+  fi

+}

+

+print_usage()

+{

+    echo "Usage: $0 --ucrt --uwp --darwin {macos,ios,tvos,watchos,xros} --simulator triplet"

+}

+

+

+for ARG in "$@"; do

+  case $ARG in

+    --uwp)

+      UWP=1

+      ;;

+    --ucrt)

+      UCRT=1

+      ;;

+    --simulator)

+      SIMULATOR=1

+      ;;

+    --darwin=*)

+      validate_darwin $ARG

+      ;;

+    *-*-*)

+      validate_triplet $ARG

+      break

+      ;;

+    *)

+      print_usage

+      abort_err "Unknown parameter $ARG"

+      ;;

+  esac

+done

+

+case $OS in

+  mingw32|mingw32ucrt|mingw32uwp)

+    if test ! -z "$UWP"; then

+      abort_err "UWP Windows is Tier 3"

+    fi

+    if test ! -z "$UCRT"; then

+      return_triplet $ARCH-pc-windows-gnullvm

+    else

+      return_triplet $ARCH-pc-windows-gnu

+    fi

+    ;;

+

+  android)

+    case $ARCH in

+      aarch64|i686|x86_64)

+        return_triplet $TRIPLET

+        ;;

+    esac

+    ;;

+

+  androideabi)

+    case $ARCH in

+      arm|armv7|thumbv7neon)

+        return_triplet $TRIPLET

+        ;;

+    esac

+    ;;

+

+  darwin*)

+    case $DARWIN in

+      macos)

+        case $ARCH in

+          aarch64|arm64)

+            return_triplet aarch64-apple-darwin

+            ;;

+          x86_64)

+            return_triplet x86_64-apple-darwin

+            ;;

+        esac

+        ;;

+

+      ios)

+        if test ! -z "$SIMULATOR"; then

+          case $ARCH in

+            aarch64|arm64)

+              return_triplet aarch64-apple-ios-sim

+              ;;

+          esac

+        else

+          case $ARCH in

+            aarch64|arm64)

+              return_triplet aarch64-apple-ios

+              ;;

+            x86_64)

+              return_triplet x86_64-apple-ios

+              ;;

+          esac

+        fi

+        ;;

+

+    esac

+    abort_err "Unsupported Darwin triplet '$TRIPLET' for '$DARWIN'"

+    ;;

+

+  gnueabihf)

+    case $ARCH in

+      arm|armv7|thumbv7neon)

+        return_triplet $ARCH-unknown-linux-gnueabihf

+        ;;

+    esac

+    ;;

+

+  gnu)

+    case $ARCH in

+      riscv64)

+        return_triplet riscv64gc-unknown-linux-gnu

+        ;;

+      x86_64|aarch64|i686|loongarch64|powerpc|powerpc64|powerpcle|s390x|i586|sparc64)

+        return_triplet $ARCH-unknown-linux-gnu

+        ;;

+    esac

+    ;;

+

+  netbsd)

+    case $ARCH in

+      x86_64)

+        return_triplet x86_64-unknown-netbsd

+        ;;

+    esac

+    ;;

+

+  freebsd)

+    case $ARCH in

+      x86_64)

+        return_triplet x86_64-unknown-freebsd

+        ;;

+    esac

​

@@ -7,64 +7,46 @@

 RUST_VERSION_MIN=1.63.0

 ifdef HAVE_WIN32

+ifdef HAVE_WINSTORE

+RUST_TARGET_FLAGS += --uwp

+endif

 ifdef HAVE_UCRT

 # does not work as Tier 2 before that

 RUST_VERSION_MIN=1.79.0

-

-ifndef HAVE_WINSTORE # UWP is available as Tier 3

-ifeq ($(HOST),i686-w64-mingw32)

-RUST_TARGET = i686-pc-windows-gnullvm # ARCH is i386

-else ifneq ($(HOST),armv7-w64-mingw32)

-# Not supported on armv7

-RUST_TARGET = $(ARCH)-pc-windows-gnullvm

-endif # archs

-endif # WINSTORE

-else # MSVCRT

-ifeq ($(HOST),i686-w64-mingw32)

-RUST_TARGET = i686-pc-windows-gnu # ARCH is i386

-else ifeq ($(HOST),x86_64-w64-mingw32)

-RUST_TARGET = $(ARCH)-pc-windows-gnu

-else

-# Not supported on armv7/aarch64 yet

-endif # archs

-endif # MSVCRT

-else ifdef HAVE_ANDROID

-RUST_TARGET = $(HOST)

-else ifdef HAVE_IOS

-ifneq ($(ARCH),arm) # iOS 32bit is Tier 3

-ifneq ($(ARCH),i386) # iOS 32bit is Tier 3

-ifndef HAVE_TVOS # tvOS is Tier 3

-RUST_TARGET = $(ARCH)-apple-ios

-endif

+RUST_TARGET_FLAGS += --ucrt

 endif

 endif

-else ifdef HAVE_MACOSX

-RUST_TARGET = $(ARCH)-apple-darwin

-# else ifdef HAVE_SOLARIS

-# Solaris x86_64 is Tier 3

-# RUST_TARGET = x86_64-sun-solaris

-else ifdef HAVE_LINUX

-ifeq ($(HOST),arm-linux-gnueabihf)

-RUST_TARGET = arm-unknown-linux-gnueabihf #add eabihf

-else

-ifeq ($(HOST),riscv64-linux-gnu)

-RUST_TARGET = riscv64gc-unknown-linux-gnu

+

+ifdef HAVE_DARWIN_OS

+ifdef HAVE_TVOS

+RUST_TARGET_FLAGS += --darwin=tvos

+else ifdef HAVE_WATCHOS

+RUST_TARGET_FLAGS += --darwin=watchos

+else ifdef HAVE_IOS

+RUST_TARGET_FLAGS += --darwin=ios

 else

-RUST_TARGET = $(ARCH)-unknown-linux-gnu

+RUST_TARGET_FLAGS += --darwin=macos

+endif

+ifdef HAVE_SIMULATOR

+RUST_TARGET_FLAGS += --simulator

 endif

 endif

-else ifdef HAVE_BSD

-RUST_TARGET = $(HOST)

-else ifdef HAVE_EMSCRIPTEN

-RUST_TARGET = $(HOST)

+

+ifneq ($(findstring darwin,$(BUILD)),)

+RUST_BUILD_FLAGS += --darwin=macos

 endif

+RUST_TARGET := $(shell $(SRC)/get-rust-target.sh $(RUST_TARGET_FLAGS) $(HOST) 2>/dev/null || echo FAIL)

+RUST_HOST :=  $(shell $(SRC)/get-rust-target.sh $(RUST_BUILD_FLAGS) $(BUILD) 2>/dev/null || echo FAIL)

+

+ifneq ($(RUST_HOST),FAIL)

 # For now, VLC don't support Tier 3 platforms (ios 32bit, tvOS).

 # Supporting a Tier 3 platform means building an untested rust toolchain.

 # TODO Let's hope tvOS move from Tier 3 to Tier 2 before the VLC 4.0 release.

-ifneq ($(RUST_TARGET),)

+ifneq ($(RUST_TARGET),FAIL)

 BUILD_RUST="1"

 endif

+endif

 RUSTUP_HOME= $(BUILDBINDIR)/.rustup

 CARGO_HOME = $(BUILDBINDIR)/.cargo

@@ -84,12 +66,17 @@

 CARGO_ENV = TARGET_CC="$(CC)" TARGET_AR="$(AR)" TARGET_RANLIB="$(RANLIB)" \

    TARGET_CFLAGS="$(CFLAGS)" RUSTFLAGS="$(RUSTFLAGS)"

+CARGO_ENV_NATIVE = TARGET_CC="$(BUILDCC)" TARGET_AR="$(BUILDAR)" TARGET_RANLIB="$(BUILDRANLIB)" \

+   TARGET_CFLAGS="$(BUILDCFLAGS)"

 ifneq ($(call system_tool_majmin, cargo --version),)

 CARGO = RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV) cargo

+CARGO_NATIVE = RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV_NATIVE) cargo

 else

 CARGO = . $(CARGO_HOME)/env && \

         RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV) cargo

+CARGO_NATIVE = . $(CARGO_HOME)/env && \

+        RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV_NATIVE) cargo

 endif

 CARGO_INSTALL_ARGS = --target=$(RUST_TARGET) --prefix=$(PREFIX) \

​

@@ -23,12 +23,11 @@

 # we may not need cargo if the tarball is downloaded, but it will be needed by rav1e anyway

 ifdef HAVE_CROSS_COMPILE

-DEPS_rav1e-vendor = rustc-cross $(DEPS_rustc-cross)

 DEPS_rav1e = rustc-cross $(DEPS_rustc-cross)

 else

-DEPS_rav1e-vendor = rustc $(DEPS_rustc)

 DEPS_rav1e = rustc $(DEPS_rustc)

 endif

+DEPS_rav1e-vendor = rustc $(DEPS_rustc)

 DEPS_rav1e += rav1e-vendor $(DEPS_rav1e-vendor) cargo-c $(DEPS_cargo-c)

 # rav1e-vendor

@@ -37,7 +36,7 @@

    $(RM) -R $@

    mkdir -p $@

    tar xzfo $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz -C $@ --strip-components=1

-   cd $@ && $(CARGO) vendor --locked rav1e-$(RAV1E_VERSION)-vendor

+   cd $@ && $(CARGO_NATIVE) vendor --locked rav1e-$(RAV1E_VERSION)-vendor

    cd $@ && tar -jcf rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 rav1e-$(RAV1E_VERSION)-vendor

    install $@/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 "$(TARBALLS)"

    # cd $@ && sha512sum rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 > SHA512SUMS

​

@@ -17,13 +17,14 @@

          RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup

 endif

-ifeq ($(call system_tool_matches_min, cargo --version,$(RUST_VERSION_MIN)),)

+ifeq ($(call system_tool_matches_min, echo 'fn main() {}' | rustc --target=$(RUST_HOST) --emit=dep-info - -o /dev/null 2>/dev/null && rustc --target=$(RUST_HOST) --version,$(RUST_VERSION_MIN)),)

 PKGS_FOUND += rustc

-# TODO detect if the target is available

-# PKGS_FOUND += rustc-cross

 else

 DEPS_rustc = rustup $(DEPS_rustup)

 endif

+ifeq ($(call system_tool_matches_min, echo 'fn main() {}' | rustc --target=$(RUST_TARGET) --emit=dep-info - -o /dev/null 2>/dev/null && rustc --target=$(RUST_TARGET) --version,$(RUST_VERSION_MIN)),)

+PKGS_FOUND += rustc-cross

+endif

 endif

​

@@ -20,7 +20,7 @@

 variables:

     VLC_TEST_TIMEOUT: 60

-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240612181044

+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240722111928

     VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240617101054

     VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240617101054

     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20240402131352

@@ -381,10 +381,10 @@

         - |

             # We split in two different commands to handle the case where

             # the coverage will be generated on different jobs later.

-            # Note: qt6-assets_qrc.cpp, qt6-qml_qrc.cpp, qt6-shaders_qrc.cpp, qt6-windows_qrc.cpp need to be remove from the report since their

+            # Note: qt generated files need to be remove from the report since their

             # coverage should not be checked. It leads to gcovr having trouble

             # parsing the coverage otherwise.

-            gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude build-meson/modules/gui/qt/qt6-assets_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-qml_qrc.cpp --exclude build-meson/modules/gui/qt/shaders/qt6-shaders_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-windows_qrc.cpp

+            gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude "build-meson/modules/gui/qt/.*_qrc.cpp" --exclude "build-meson/modules/gui/qt/.*_assets.cpp"

         - mkdir html-coverage

         - >

​

@@ -637,6 +637,9 @@

     export BUILDFORIOS="yes"

     export BUILDFORWATCHOS="yes"

 fi

+if  "$VLC_HOST_PLATFORM_SIMULATOR" = "yes" ; then

+    export BUILDFORSIMULATOR="yes"

+fi

 # Default to "make" if there is no MAKE env variable

 MAKE=${MAKE:-make}

​

@@ -85,6 +85,7 @@

        5317FE04294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */; };

        532572032C3D79D80068DEC3 /* VLCLibrarySegmentBookmarkedLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 532572022C3D79D80068DEC3 /* VLCLibrarySegmentBookmarkedLocation.m */; };

        532572062C3EF3710068DEC3 /* VLCLibraryWindowNavigationSidebarOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 532572052C3EF3710068DEC3 /* VLCLibraryWindowNavigationSidebarOutlineView.m */; };

+       5325720F2C4966630068DEC3 /* VLCLibraryShowsDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 5325720E2C4966630068DEC3 /* VLCLibraryShowsDataSource.m */; };

        5325C57D29302E6800B2B63A /* VLCLibraryAudioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5325C57B29302E6800B2B63A /* VLCLibraryAudioViewController.m */; };

        533B5D2C29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 533B5D2B29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m */; };

        534E73E229D2EDB1009982DE /* VLCBookmarksTableViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 534E73E129D2EDB1009982DE /* VLCBookmarksTableViewDelegate.m */; };

@@ -300,6 +301,8 @@

        532572022C3D79D80068DEC3 /* VLCLibrarySegmentBookmarkedLocation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySegmentBookmarkedLocation.m; sourceTree = "<group>"; };

        532572042C3EF3710068DEC3 /* VLCLibraryWindowNavigationSidebarOutlineView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowNavigationSidebarOutlineView.h; sourceTree = "<group>"; };

        532572052C3EF3710068DEC3 /* VLCLibraryWindowNavigationSidebarOutlineView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowNavigationSidebarOutlineView.m; sourceTree = "<group>"; };

+       5325720D2C4966630068DEC3 /* VLCLibraryShowsDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryShowsDataSource.h; sourceTree = "<group>"; };

+       5325720E2C4966630068DEC3 /* VLCLibraryShowsDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryShowsDataSource.m; sourceTree = "<group>"; };

        5325C57B29302E6800B2B63A /* VLCLibraryAudioViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAudioViewController.m; sourceTree = "<group>"; };

        5325C57C29302E6800B2B63A /* VLCLibraryAudioViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAudioViewController.h; sourceTree = "<group>"; };

        533B5D2A29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCBookmarksTableViewDataSource.h; sourceTree = "<group>"; };

@@ -1554,6 +1557,8 @@

        53B447EB293BB47A00857588 /* video-library */ = {

            isa = PBXGroup;

            children = (

+               5325720D2C4966630068DEC3 /* VLCLibraryShowsDataSource.h */,

+               5325720E2C4966630068DEC3 /* VLCLibraryShowsDataSource.m */,

                536EFC37295E521600F4CB13 /* VLCLibraryVideoViewController.h */,

                536EFC38295E521600F4CB13 /* VLCLibraryVideoViewController.m */,

                53B447F0293BB47A00857588 /* VLCLibraryVideoGroupDescriptor.h */,

@@ -2068,6 +2073,7 @@

                53ED473C29CBC64200795DB1 /* NSPasteboardItem+VLCAdditions.m in Sources */,

                7D713D362201DC640042BEB7 /* VLCLibraryWindow.xib in Sources */,

                1CCC88EE2078A3D500E5626F /* VLCStatusBarIconMainMenu.xib in Sources */,

+               5325720F2C4966630068DEC3 /* VLCLibraryShowsDataSource.m in Sources */,

                1CCC88EF2078A3D500E5626F /* VLCFullScreenPanel.xib in Sources */,

                536283F5291146BC00640C15 /* VLCLibraryCollectionViewSupplementaryDetailView.m in Sources */,

                531343E72A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarViewController.m in Sources */,

​

@@ -198,6 +198,7 @@

    demux/mkv/chapter_command.hpp demux/mkv/chapter_command.cpp \

    demux/mkv/chapter_command_dvd.hpp demux/mkv/chapter_command_dvd.cpp \

    demux/mkv/chapter_command_script.hpp demux/mkv/chapter_command_script.cpp \

+   demux/mkv/chapter_command_script_common.hpp demux/mkv/chapter_command_script_common.cpp \

    demux/mkv/stream_io_callback.hpp demux/mkv/stream_io_callback.cpp \

    demux/mkv/vlc_colors.c demux/mkv/vlc_colors.h \

    demux/vobsub.h \

​

@@ -275,6 +275,7 @@

             'mkv/chapter_command.cpp',

             'mkv/chapter_command_dvd.cpp',

             'mkv/chapter_command_script.cpp',

+            'mkv/chapter_command_script_common.cpp',

             'mkv/stream_io_callback.cpp',

             'mkv/vlc_colors.c',

             'mp4/libmp4.c',

​

@@ -89,7 +89,6 @@

     struct vlc_logger *l;

     chapter_codec_vm & vm;

 };

-

 } // namespace

 #endif

​

@@ -1,7 +1,7 @@

 // Copyright (C) 2003-2024 VLC authors and VideoLAN

 // SPDX-License-Identifier: LGPL-2.1-or-later

 //

-// chapter_command_script.cpp : DVD codec for Matroska Chapter Codecs

+// chapter_command_script.cpp : Matroska Script Codec for Matroska Chapter Codecs

 // Authors: Laurent Aimar <fenrir@via.ecp.fr>

 //          Steve Lhomme <steve.lhomme@free.fr>

@@ -11,6 +11,7 @@

 namespace mkv {

+//Matroska Script

 const std::string matroska_script_interpretor_c::CMD_MS_GOTO_AND_PLAY = "GotoAndPlay";

 // see http://www.matroska.org/technical/specs/chapters/index.html#mscript

@@ -65,36 +66,4 @@

     return b_result;

 }

-bool matroska_script_codec_c::Enter()

-{

-    bool f_result = false;

-    ChapterProcess::iterator index = enter_cmds.begin();

-    while ( index != enter_cmds.end() )

-    {

-        if ( (*index).GetSize() )

-        {

-            vlc_debug( l, "Matroska Script enter command" );

-            f_result |= interpreter.Interpret( (*index).GetBuffer(), (*index).GetSize() );

-        }

-        ++index;

-    }

-    return f_result;

-}

-

-bool matroska_script_codec_c::Leave()

-{

-    bool f_result = false;

-    ChapterProcess::iterator index = leave_cmds.begin();

-    while ( index != leave_cmds.end() )

-    {

-        if ( (*index).GetSize() )

-        {

-            vlc_debug( l, "Matroska Script leave command" );

-            f_result |= interpreter.Interpret( (*index).GetBuffer(), (*index).GetSize() );

-        }

-        ++index;

-    }

-    return f_result;

-}

-

 } // namespace

​

@@ -8,42 +8,39 @@

 #ifndef VLC_MKV_CHAPTER_COMMAND_SCRIPT_HPP_

 #define VLC_MKV_CHAPTER_COMMAND_SCRIPT_HPP_

-#include "chapter_command.hpp"

+#include "chapter_command_script_common.hpp"

 namespace mkv {

-class matroska_script_interpretor_c

+class matroska_script_interpretor_c : public matroska_script_interpreter_common_c

 {

 public:

     matroska_script_interpretor_c( struct vlc_logger *log, chapter_codec_vm & vm_ )

-    :l( log )

-    ,vm( vm_ )

+    :matroska_script_interpreter_common_c(log, vm_)

     {}

-    bool Interpret( const binary * p_command, size_t i_size );

+    bool Interpret( const binary * p_command, size_t i_size ) override;

-    // DVD command IDs

+    // Matroska Script commands

     static const std::string CMD_MS_GOTO_AND_PLAY;

-protected:

-    struct vlc_logger *l;

-    chapter_codec_vm & vm;

 };

-

-class matroska_script_codec_c : public chapter_codec_cmds_c

+class matroska_script_codec_c : public matroska_script_codec_common_c

 {

 public:

-    matroska_script_codec_c( struct vlc_logger *log, chapter_codec_vm & vm_ )

-    :chapter_codec_cmds_c( log, vm_, MATROSKA_CHAPTER_CODEC_NATIVE )

-    ,interpreter( log, vm_ )

+    matroska_script_codec_c( struct vlc_logger *log, chapter_codec_vm & vm_, matroska_script_interpretor_c & interpreter_)

+    :matroska_script_codec_common_c( log, vm_, MATROSKA_CHAPTER_CODEC_NATIVE )

+    ,interpreter( interpreter_ )

     {}

-    bool Enter();

-    bool Leave();

+    matroska_script_interpreter_common_c & get_interpreter() override

+    {

+        return interpreter;

+    }

 protected:

-    matroska_script_interpretor_c interpreter;

+    matroska_script_interpretor_c & interpreter;

 };

 } // namespace

​

@@ -0,0 +1,47 @@

+// Copyright (C) 2024 VLC authors and VideoLAN

+// SPDX-License-Identifier: LGPL-2.1-or-later

+//

+// chapter_command_script_common.cpp : 

+// Common file for Matroska JS and Matroska Script

+// Authors: Laurent Aimar <fenrir@via.ecp.fr>

+//          Steve Lhomme <steve.lhomme@free.fr>

+//          Khalid Masum <khalid.masum.92@gmail.com>

+

+

+#include "chapter_command_script_common.hpp"

+

+namespace mkv {

+

+bool matroska_script_codec_common_c::Enter()

+{

+    bool f_result = false;

+    ChapterProcess::iterator index = enter_cmds.begin();

+    while ( index != enter_cmds.end() )

+    {

+        if ( (*index).GetSize() )

+        {

+            vlc_debug( l, "Matroska Script enter command" );

+            f_result |= get_interpreter().Interpret( (*index).GetBuffer(), (*index).GetSize() );

+        }

+        ++index;

+    }

+    return f_result;

+}

+

+bool matroska_script_codec_common_c::Leave()