diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index a8b5713f7dce3290dab35cee075e09ae18529b60..fc497df09a2bd26c3ab25f06d84b8919728c1550 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -36,8 +36,6 @@
1C3113C51E508C6900D4DD76 /* misc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28003E2EB1C0059A3A7 /* misc.m */; };
1C3113C71E508C6900D4DD76 /* VLCOpenWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */; };
1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* VLCOutput.m */; };
- 1C3113CB1E508C6900D4DD76 /* VLCPLItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F21B5599E40052293C /* VLCPLItem.m */; };
- 1C3113CD1E508C6900D4DD76 /* VLCPLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F41B5599E40052293C /* VLCPLModel.m */; };
1C3113CF1E508C6900D4DD76 /* prefs_widgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */; };
1C3113D11E508C6900D4DD76 /* prefs.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28603E2EB1C0059A3A7 /* prefs.m */; };
1C3113D31E508C6900D4DD76 /* VLCResumeDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633121CB1B51122700E636DA /* VLCResumeDialogController.m */; };
@@ -47,9 +45,7 @@
1C3113DD1E508C6900D4DD76 /* VLCTrackSynchronizationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC4137464CD0003010A /* VLCTrackSynchronizationWindowController.m */; };
1C3113DF1E508C6900D4DD76 /* VLCVideoEffectsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */; };
1C3113E11E508C6900D4DD76 /* VLCVoutView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */; };
- 1C3113E31E508C6900D4DD76 /* VLCPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */; };
1C3113E51E508C6900D4DD76 /* VLCPlaylistInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */; };
- 1C3113E71E508C6900D4DD76 /* VLCPlaylistView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */; };
1C3113E91E508C6900D4DD76 /* VLCScrollingClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */; };
1C3113ED1E508C6900D4DD76 /* VLCTimeSelectionPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD3667A1B7A242E0054E39F /* VLCTimeSelectionPanelController.m */; };
1C3113EF1E508C7600D4DD76 /* VLCRendererDiscovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBBB8B61D114628001BD9BA /* VLCRendererDiscovery.m */; };
@@ -78,7 +74,6 @@
1CCC88FC2078A3D500E5626F /* LogMessageWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */; };
1CCC88FD2078A3D500E5626F /* Open.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B82240C1E4D2A9000833BE1 /* Open.xib */; };
1CCC88FE2078A3D500E5626F /* PlaylistAccessoryView.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B82240D1E4D2A9000833BE1 /* PlaylistAccessoryView.xib */; };
- 1CCC88FF2078A3D500E5626F /* PlaylistMenu.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B82240E1E4D2A9000833BE1 /* PlaylistMenu.xib */; };
1CCC89002078A3D500E5626F /* PopupPanel.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B82240F1E4D2A9000833BE1 /* PopupPanel.xib */; };
1CCC89012078A3D500E5626F /* Preferences.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224101E4D2A9000833BE1 /* Preferences.xib */; };
1CCC89022078A3D500E5626F /* ResumeDialog.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224111E4D2A9000833BE1 /* ResumeDialog.xib */; };
@@ -239,7 +234,6 @@
6B82240B1E4D2A9000833BE1 /* MediaInfo.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MediaInfo.xib; sourceTree = "<group>"; };
6B82240C1E4D2A9000833BE1 /* Open.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Open.xib; sourceTree = "<group>"; };
6B82240D1E4D2A9000833BE1 /* PlaylistAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlaylistAccessoryView.xib; sourceTree = "<group>"; };
- 6B82240E1E4D2A9000833BE1 /* PlaylistMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlaylistMenu.xib; sourceTree = "<group>"; };
6B82240F1E4D2A9000833BE1 /* PopupPanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PopupPanel.xib; sourceTree = "<group>"; };
6B8224101E4D2A9000833BE1 /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
6B8224111E4D2A9000833BE1 /* ResumeDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ResumeDialog.xib; sourceTree = "<group>"; };
@@ -484,8 +478,6 @@
7D871D391B5E684D000B56C0 /* helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = helpers.h; sourceTree = "<group>"; };
7D8BB0B318302AC000FAE9B7 /* VLCLogWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLogWindowController.h; sourceTree = "<group>"; };
7D8BB0B418302AC000FAE9B7 /* VLCLogWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLogWindowController.m; sourceTree = "<group>"; };
- 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistView.h; sourceTree = "<group>"; };
- 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistView.m; sourceTree = "<group>"; };
7DB40D2820CBCEB500F63173 /* VLCMainMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMainMenu.h; sourceTree = "<group>"; };
7DB40D2920CBCEB500F63173 /* VLCMainMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMainMenu.m; sourceTree = "<group>"; };
7DB40D2B20CBCEC200F63173 /* VLCStatusBarIcon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCStatusBarIcon.m; sourceTree = "<group>"; };
@@ -520,10 +512,6 @@
7DF812EE1B555A340052293C /* VLCInputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCInputManager.m; sourceTree = "<group>"; };
7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCKeyboardBacklightControl.h; sourceTree = "<group>"; };
7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCKeyboardBacklightControl.m; sourceTree = "<group>"; };
- 7DF812F11B5599E40052293C /* VLCPLItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPLItem.h; sourceTree = "<group>"; };
- 7DF812F21B5599E40052293C /* VLCPLItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPLItem.m; sourceTree = "<group>"; };
- 7DF812F31B5599E40052293C /* VLCPLModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPLModel.h; sourceTree = "<group>"; };
- 7DF812F41B5599E40052293C /* VLCPLModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPLModel.m; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistInfo.h; sourceTree = "<group>"; };
8E49720106417F6800370C9F /* VLCPlaylistInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistInfo.m; sourceTree = "<group>"; };
8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCOutput.h; sourceTree = "<group>"; };
@@ -539,8 +527,6 @@
8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = misc.m; sourceTree = "<group>"; };
8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCOpenWindowController.h; sourceTree = "<group>"; };
8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCOpenWindowController.m; sourceTree = "<group>"; };
- 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPlaylist.h; sourceTree = "<group>"; };
- 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylist.m; sourceTree = "<group>"; };
8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prefs.h; sourceTree = "<group>"; };
8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prefs.m; sourceTree = "<group>"; };
CC0663341566C34C003A411C /* VLCConvertAndSaveWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = VLCConvertAndSaveWindowController.h; sourceTree = "<group>"; };
@@ -1195,8 +1181,6 @@
7D349C9520CBC823003359A1 /* Playlist */ = {
isa = PBXGroup;
children = (
- 7DB317A320CBCA9500673FB8 /* Controller */,
- 7DB317A120CBCA8500673FB8 /* Model */,
7DB317A220CBCA8B00673FB8 /* View */,
);
name = Playlist;
@@ -1360,37 +1344,15 @@
name = "Library Window";
sourceTree = "<group>";
};
- 7DB317A120CBCA8500673FB8 /* Model */ = {
- isa = PBXGroup;
- children = (
- 7DF812F11B5599E40052293C /* VLCPLItem.h */,
- 7DF812F21B5599E40052293C /* VLCPLItem.m */,
- 7DF812F31B5599E40052293C /* VLCPLModel.h */,
- 7DF812F41B5599E40052293C /* VLCPLModel.m */,
- );
- name = Model;
- sourceTree = "<group>";
- };
7DB317A220CBCA8B00673FB8 /* View */ = {
isa = PBXGroup;
children = (
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
8E49720106417F6800370C9F /* VLCPlaylistInfo.m */,
- 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */,
- 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */,
);
name = View;
sourceTree = "<group>";
};
- 7DB317A320CBCA9500673FB8 /* Controller */ = {
- isa = PBXGroup;
- children = (
- 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
- 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
- );
- name = Controller;
- sourceTree = "<group>";
- };
7DB317A420CBCAAD00673FB8 /* Advanced */ = {
isa = PBXGroup;
children = (
@@ -1597,7 +1559,6 @@
6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */,
6B82240C1E4D2A9000833BE1 /* Open.xib */,
6B82240D1E4D2A9000833BE1 /* PlaylistAccessoryView.xib */,
- 6B82240E1E4D2A9000833BE1 /* PlaylistMenu.xib */,
6B82240F1E4D2A9000833BE1 /* PopupPanel.xib */,
6B8224101E4D2A9000833BE1 /* Preferences.xib */,
6B8224111E4D2A9000833BE1 /* ResumeDialog.xib */,
@@ -1694,7 +1655,6 @@
1CCC88FC2078A3D500E5626F /* LogMessageWindow.xib in Sources */,
1CCC88FD2078A3D500E5626F /* Open.xib in Sources */,
1CCC88FE2078A3D500E5626F /* PlaylistAccessoryView.xib in Sources */,
- 1CCC88FF2078A3D500E5626F /* PlaylistMenu.xib in Sources */,
1CCC89002078A3D500E5626F /* PopupPanel.xib in Sources */,
1CCC89012078A3D500E5626F /* Preferences.xib in Sources */,
7DC21A7422049A6600F98A02 /* VLCOpenInputMetadata.m in Sources */,
@@ -1769,10 +1729,8 @@
1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */,
1C1C62011F8260A90052DD4F /* VLCWrappableTextField.m in Sources */,
6BBB05DA1EEFEA29003A1019 /* VLCHUDOutlineView.m in Sources */,
- 1C3113CB1E508C6900D4DD76 /* VLCPLItem.m in Sources */,
6B8A6B0B2128697E00DC29F3 /* VLCSourceListTableCellView.m in Sources */,
7D445D842202524D00263D34 /* VLCPlaylistItem.m in Sources */,
- 1C3113CD1E508C6900D4DD76 /* VLCPLModel.m in Sources */,
1C3113CF1E508C6900D4DD76 /* prefs_widgets.m in Sources */,
7D0F63FF2201F63400FDB91F /* VLCPlaylistTableCellView.m in Sources */,
1C3113D11E508C6900D4DD76 /* prefs.m in Sources */,
@@ -1794,9 +1752,7 @@
6B6FFF701EF9EC350001CEB1 /* CompatibilityFixes.m in Sources */,
1C3113DF1E508C6900D4DD76 /* VLCVideoEffectsWindowController.m in Sources */,
1C3113E11E508C6900D4DD76 /* VLCVoutView.m in Sources */,
- 1C3113E31E508C6900D4DD76 /* VLCPlaylist.m in Sources */,
1C3113E51E508C6900D4DD76 /* VLCPlaylistInfo.m in Sources */,
- 1C3113E71E508C6900D4DD76 /* VLCPlaylistView.m in Sources */,
6B7F1FDF1F07DA920002BDD8 /* VLCHexNumberFormatter.m in Sources */,
7DB40D2A20CBCEB500F63173 /* VLCMainMenu.m in Sources */,
1C3113E91E508C6900D4DD76 /* VLCScrollingClipView.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 920135187652a6ac1e746168d7e3a8aa37c84b91..98e0e24f54bdc7e4104ef3426e23a6aab59bcc33 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -57,11 +57,7 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/VLCOpenWindowController.h gui/macosx/VLCOpenWindowController.m \
gui/macosx/VLCOpenInputMetadata.h gui/macosx/VLCOpenInputMetadata.m \
gui/macosx/VLCOutput.h gui/macosx/VLCOutput.m \
- gui/macosx/VLCPlaylistView.h gui/macosx/VLCPlaylistView.m \
- gui/macosx/VLCPlaylist.h gui/macosx/VLCPlaylist.m \
gui/macosx/VLCPlaylistInfo.h gui/macosx/VLCPlaylistInfo.m \
- gui/macosx/VLCPLItem.h gui/macosx/VLCPLItem.m \
- gui/macosx/VLCPLModel.h gui/macosx/VLCPLModel.m \
gui/macosx/prefs.h gui/macosx/prefs.m \
gui/macosx/prefs_widgets.h gui/macosx/prefs_widgets.m \
gui/macosx/VLCPopupPanelController.h gui/macosx/VLCPopupPanelController.m \
@@ -165,7 +161,6 @@ libmacosx_plugin_la_XIB_SOURCES = \
gui/macosx/UI/MediaInfo.xib \
gui/macosx/UI/Open.xib \
gui/macosx/UI/PlaylistAccessoryView.xib \
- gui/macosx/UI/PlaylistMenu.xib \
gui/macosx/UI/PopupPanel.xib \
gui/macosx/UI/Preferences.xib \
gui/macosx/UI/ResumeDialog.xib \
diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib
index c0823b2ffc3bf03220a0f87687d0b0a55d4b3c8d..e6b2f1b09e65078d0ea19158514ac1b950b60b50 100644
--- a/modules/gui/macosx/UI/MainWindow.xib
+++ b/modules/gui/macosx/UI/MainWindow.xib
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.13.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.13.2"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -270,55 +270,11 @@
<constraint firstAttribute="bottom" secondItem="5605" secondAttribute="bottom" id="fdA-1r-rKk"/>
</constraints>
</customView>
- <scrollView focusRingType="none" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4372">
- <rect key="frame" x="0.0" y="0.0" width="477" height="274"/>
- <clipView key="contentView" id="wTX-wO-asx">
- <rect key="frame" x="1" y="0.0" width="475" height="273"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="reverseSequential" alternatingRowBackgroundColors="YES" autosaveColumns="NO" rowHeight="15" headerView="4373" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="4380" id="4376" customClass="VLCPlaylistView">
- <rect key="frame" x="0.0" y="0.0" width="475" height="250"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <size key="intercellSpacing" width="3" height="2"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
- <tableViewGridLines key="gridStyleMask" vertical="YES"/>
- <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
- <tableColumns>
- <tableColumn identifier="status" width="18" minWidth="18" maxWidth="18" id="4380">
- <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
- </tableHeaderCell>
- <imageCell key="dataCell" controlSize="small" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="4381"/>
- <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
- </tableColumn>
- </tableColumns>
- </outlineView>
- </subviews>
- </clipView>
- <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="4374">
- <rect key="frame" x="1" y="234" width="0.0" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="4375">
- <rect key="frame" x="386" y="23" width="16" height="0.0"/>
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- <tableHeaderView key="headerView" id="4373">
- <rect key="frame" x="0.0" y="0.0" width="475" height="23"/>
- <autoresizingMask key="autoresizingMask"/>
- </tableHeaderView>
- </scrollView>
</subviews>
<constraints>
- <constraint firstAttribute="bottom" secondItem="4372" secondAttribute="bottom" id="7nB-oh-n2V"/>
<constraint firstItem="4722" firstAttribute="leading" secondItem="U2A-0F-udY" secondAttribute="leading" id="FCe-Dh-MEG"/>
<constraint firstAttribute="trailing" secondItem="4722" secondAttribute="trailing" id="G8U-K8-Aao"/>
- <constraint firstItem="4372" firstAttribute="top" secondItem="U2A-0F-udY" secondAttribute="top" id="TzQ-ic-Og9"/>
<constraint firstAttribute="bottom" secondItem="4722" secondAttribute="bottom" id="dSW-Uh-nP9"/>
- <constraint firstItem="4372" firstAttribute="leading" secondItem="U2A-0F-udY" secondAttribute="leading" id="fZe-5h-83L"/>
- <constraint firstAttribute="trailing" secondItem="4372" secondAttribute="trailing" id="ozJ-dU-Qw7"/>
<constraint firstItem="4722" firstAttribute="top" secondItem="U2A-0F-udY" secondAttribute="top" id="tIs-Fh-Jsd"/>
</constraints>
</customView>
@@ -711,8 +667,6 @@
<outlet property="dropzoneImageView" destination="4725" id="Ck9-vp-aDM"/>
<outlet property="dropzoneLabel" destination="4727" id="HkS-xv-7B6"/>
<outlet property="dropzoneView" destination="4722" id="a41-TD-aJs"/>
- <outlet property="outlineView" destination="4376" id="92d-4j-4PK"/>
- <outlet property="playlistScrollView" destination="4372" id="QDP-7m-wKJ"/>
<outlet property="podcastAddButton" destination="5263" id="Rg8-kX-6dU"/>
<outlet property="podcastRemoveButton" destination="5302" id="T6b-Y8-Usc"/>
<outlet property="podcastSubscribeCancelButton" destination="5268" id="nSd-2J-TCb"/>
diff --git a/modules/gui/macosx/UI/PlaylistAccessoryView.xib b/modules/gui/macosx/UI/PlaylistAccessoryView.xib
index e75cab4d187fed6cca1eeb531c5877d4b04e971b..9fb68d0fea15ba6e648b1c23001876a3dd8147e7 100644
--- a/modules/gui/macosx/UI/PlaylistAccessoryView.xib
+++ b/modules/gui/macosx/UI/PlaylistAccessoryView.xib
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCMainMenu">
@@ -14,14 +15,14 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="efm-sw-3Se">
+ <customView misplaced="YES" id="efm-sw-3Se">
<rect key="frame" x="0.0" y="0.0" width="369" height="39"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="1" userLabel="SaveAccessoryView">
+ <customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1" userLabel="SaveAccessoryView">
<rect key="frame" x="0.0" y="0.0" width="369" height="39"/>
<subviews>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
+ <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3">
<rect key="frame" x="91" y="6" width="267" height="26"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="4">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
diff --git a/modules/gui/macosx/UI/PlaylistMenu.xib b/modules/gui/macosx/UI/PlaylistMenu.xib
deleted file mode 100644
index 2387fb187ec6dd99f744e676115eae8395239a9d..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/UI/PlaylistMenu.xib
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16G1036" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
- <dependencies>
- <development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
- </dependencies>
- <objects>
- <customObject id="-2" userLabel="File's Owner" customClass="VLCPlaylist">
- <connections>
- <outlet property="addFilesToPlaylistMenuItem" destination="lGc-nc-8Yq" id="joN-zx-w8u"/>
- <outlet property="deletePlaylistMenuItem" destination="13" id="Qwn-a7-On0"/>
- <outlet property="infoPlaylistMenuItem" destination="9" id="uIr-Np-fpB"/>
- <outlet property="playPlaylistMenuItem" destination="12" id="Dv9-jX-Q4W"/>
- <outlet property="playlistMenu" destination="1" id="i0k-dj-ZpJ"/>
- <outlet property="recursiveCollapsePlaylistMenuItem" destination="4xC-4n-AL0" id="xSX-gh-auF"/>
- <outlet property="recursiveExpandPlaylistMenuItem" destination="5" id="vFK-br-qmx"/>
- <outlet property="revealInFinderPlaylistMenuItem" destination="3" id="IrJ-gR-Zqp"/>
- <outlet property="selectAllPlaylistMenuItem" destination="14" id="drx-ij-QhT"/>
- </connections>
- </customObject>
- <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <menu title="Menu" id="1" userLabel="PlaylistMenu">
- <items>
- <menuItem title="Play" id="12">
- <connections>
- <action selector="playItem:" target="-2" id="26"/>
- </connections>
- </menuItem>
- <menuItem title="Delete" id="13">
- <connections>
- <action selector="deleteItem:" target="-2" id="27"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="11">
- <modifierMask key="keyEquivalentModifierMask" command="YES"/>
- </menuItem>
- <menuItem title="Select All" id="14">
- <connections>
- <action selector="selectAll:" target="-2" id="28"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="8">
- <modifierMask key="keyEquivalentModifierMask" command="YES"/>
- </menuItem>
- <menuItem title="Expand All" id="5">
- <connections>
- <action selector="recursiveExpandOrCollapseNode:" target="-2" id="eXQ-bT-oYi"/>
- </connections>
- </menuItem>
- <menuItem title="Collapse All" id="4xC-4n-AL0">
- <connections>
- <action selector="recursiveExpandOrCollapseNode:" target="-2" id="uUM-ci-hOU"/>
- </connections>
- </menuItem>
- <menuItem title="Media Information..." id="9">
- <connections>
- <action selector="showInfoPanel:" target="-2" id="36"/>
- </connections>
- </menuItem>
- <menuItem title="Reveal in Finder" id="3">
- <connections>
- <action selector="revealItemInFinder:" target="-2" id="4WU-rm-69M"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="sUF-9g-Rxq"/>
- <menuItem title="Add Files" id="lGc-nc-8Yq">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="addFilesToPlaylist:" target="-2" id="r6Z-KP-ovf"/>
- </connections>
- </menuItem>
- </items>
- </menu>
- </objects>
-</document>
diff --git a/modules/gui/macosx/VLCClickerManager.m b/modules/gui/macosx/VLCClickerManager.m
index 2682d066b538cba5e681d6ae4f336144e870961a..e81c23fbe905cdd3863c637a7554026e3f451ef3 100644
--- a/modules/gui/macosx/VLCClickerManager.m
+++ b/modules/gui/macosx/VLCClickerManager.m
@@ -24,10 +24,11 @@
#import "SPMediaKeyTap.h"
#import "AppleRemote.h"
#import "VLCMain.h"
-#import "VLCPlaylist.h"
#import "VLCInputManager.h"
#import "VLCCoreInteraction.h"
#import "NSSound+VLCAdditions.h"
+#import "VLCPlaylistController.h"
+#import "VLCPlaylistModel.h"
#import <vlc_actions.h>
@interface VLCClickerManager()
@@ -107,7 +108,7 @@
_mediaKeyController = [[SPMediaKeyTap alloc] initWithDelegate:self];
VLCMain *main = [VLCMain sharedInstance];
- if (b_mediaKeySupport && ([[[main playlist] model] hasChildren] ||
+ if (b_mediaKeySupport && ([[[main playlistController] playlistModel] numberOfPlaylistItems] > 0 ||
[[main inputManager] hasInput])) {
if (!b_mediaKeyTrapEnabled) {
msg_Dbg(p_intf, "Enabling media key support");
diff --git a/modules/gui/macosx/VLCControlsBarCommon.m b/modules/gui/macosx/VLCControlsBarCommon.m
index 436899a02894ec2c8867523905377058c80014a3..6951de8409a195eb710ab17ff71f3b41587c1843 100644
--- a/modules/gui/macosx/VLCControlsBarCommon.m
+++ b/modules/gui/macosx/VLCControlsBarCommon.m
@@ -25,7 +25,6 @@
#import "VLCMain.h"
#import "VLCCoreInteraction.h"
#import "VLCMainMenu.h"
-#import "VLCPlaylist.h"
#import "CompatibilityFixes.h"
#import "NSString+Helpers.h"
diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 781e47a24d36cc706c16bab067ccd2e93de933d9..4ac37b19ac8c14ffe89e7baef82073e3f297e5cd 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -23,7 +23,6 @@
#import "VLCConvertAndSaveWindowController.h"
#import "VLCMain.h"
-#import "VLCPlaylist.h"
#import "misc.h"
#import "VLCPopupPanelController.h"
#import "VLCTextfieldPanelController.h"
@@ -642,7 +641,11 @@
[self updateDropView];
return YES;
}
- } else if ([desired_type isEqualToString:@"VLCPlaylistItemPboardType"]) {
+ }
+
+#if 0
+ // FIXME: re-implement drag-n-drop from the new playlist
+ else if ([desired_type isEqualToString:@"VLCPlaylistItemPboardType"]) {
NSArray *draggedItems = [[[VLCMain sharedInstance] playlist] draggedItems];
// Return early to prevent unnecessary playlist access/locking
@@ -674,6 +677,7 @@
return (p_item != NULL) ? YES : NO;
}
+#endif
return NO;
}
diff --git a/modules/gui/macosx/VLCCoreInteraction.m b/modules/gui/macosx/VLCCoreInteraction.m
index 4918259d417a18004580e36f40fee8e788d8eb38..290fe05aeede75dc94293e9ce059b7919c0c96d4 100644
--- a/modules/gui/macosx/VLCCoreInteraction.m
+++ b/modules/gui/macosx/VLCCoreInteraction.m
@@ -23,7 +23,6 @@
#import "VLCCoreInteraction.h"
#import "VLCMain.h"
#import "VLCOpenWindowController.h"
-#import "VLCPlaylist.h"
#import <vlc_strings.h>
#import <vlc_url.h>
#import <vlc_modules.h>
@@ -31,6 +30,7 @@
#import <vlc_actions.h>
#import "VLCClickerManager.h"
#import "VLCPlaylistController.h"
+#import "VLCPlaylistModel.h"
static int BossCallback(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
@@ -121,12 +121,11 @@ static int BossCallback(vlc_object_t *p_this, const char *psz_var,
playlist_TogglePause(p_playlist);
vlc_object_release(p_input);
} else {
- PLRootType root = [[[[VLCMain sharedInstance] playlist] model] currentRootType];
VLCMain *mainInstance = [VLCMain sharedInstance];
- if ([[mainInstance playlist] isSelectionEmpty] && (root == ROOT_TYPE_PLAYLIST))
+ if (mainInstance.playlistController.playlistModel.numberOfPlaylistItems == 0)
[[mainInstance open] openFileGeneric];
else
- [[mainInstance playlist] playItem:nil];
+ [mainInstance.playlistController startPlaylist];
}
}
diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m
index 115212bcb204e0a22a7b9b2e808b50038e9ebd9e..4a645a7cd5ad24ced0bb2e9da502cd6343b9c00e 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -28,7 +28,6 @@
#import "VLCMain.h"
#import "VLCMainMenu.h"
#import "VLCMainWindow.h"
-#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "VLCResumeDialogController.h"
#import "VLCTrackSynchronizationWindowController.h"
@@ -259,7 +258,7 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
p_input_changed = vlc_object_hold(p_current_input);
- [[o_main playlist] currentlyPlayingItemChanged];
+// [[o_main playlist] currentlyPlayingItemChanged];
[self continuePlaybackWhereYouLeftOff:p_current_input];
@@ -516,7 +515,8 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
input_item_t *p_input_item = input_GetItem(p_current_input);
- [[[o_main playlist] model] updateItem:p_input_item];
+ // FIXME: update metadata in playlist model if needed
+// [[[o_main playlist] model] updateItem:p_input_item];
[[[VLCMain sharedInstance] currentMediaInfoPanel] updatePanelWithItem:p_input_item];
if (!p_input_item) {
diff --git a/modules/gui/macosx/VLCMain.h b/modules/gui/macosx/VLCMain.h
index 5b55a59de6ef45513ea8a7b727ec05f30efa589d..99d06d226dc81dd53aa03354c3a793ecc5a81251 100644
--- a/modules/gui/macosx/VLCMain.h
+++ b/modules/gui/macosx/VLCMain.h
@@ -60,7 +60,6 @@ static NSString * VLCAppleRemoteSettingChangedNotification = @"VLCAppleRemoteSet
@class AppleRemote;
@class VLCInfo;
@class VLCMainMenu;
-@class VLCPlaylist;
@class VLCInputManager;
@class VLCResumeDialogController;
@class VLCSimplePrefsController;
@@ -96,7 +95,6 @@ static NSString * VLCAppleRemoteSettingChangedNotification = @"VLCAppleRemoteSet
- (VLCOpenWindowController *)open;
- (VLCSimplePrefsController *)simplePreferences;
- (VLCPrefs *)preferences;
-- (VLCPlaylist *)playlist;
- (VLCCoreDialogProvider *)coreDialogProvider;
- (VLCResumeDialogController *)resumeDialog;
- (VLCInputManager *)inputManager;
diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
index 87d24588a373cfba1e9239261f4b35a3cbcaae9f..3972c251a051b12634d5176d4e02ae19cbfcd748 100644
--- a/modules/gui/macosx/VLCMain.m
+++ b/modules/gui/macosx/VLCMain.m
@@ -47,8 +47,6 @@
#import "VLCMainMenu.h"
#import "VLCVoutView.h"
#import "prefs.h"
-#import "VLCPlaylist.h"
-#import "VLCPlaylistInfo.h"
#import "VLCPlaylistInfo.h"
#import "VLCOpenWindowController.h"
#import "VLCBookmarksWindowController.h"
@@ -174,7 +172,6 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCBookmarksWindowController *_bookmarks;
VLCResumeDialogController *_resume_dialog;
VLCInputManager *_input_manager;
- VLCPlaylist *_playlist;
VLCLogWindowController *_messagePanelController;
VLCStatusBarIcon *_statusBarIcon;
VLCTrackSynchronizationWindowController *_trackSyncPanel;
@@ -235,7 +232,6 @@ static VLCMain *sharedInstance = nil;
_statusBarIcon = [[VLCStatusBarIcon alloc] init];
_voutProvider = [[VLCVideoOutputProvider alloc] init];
- _playlist = [[VLCPlaylist alloc] init];
_mainWindowController = [[NSWindowController alloc] initWithWindowNibName:@"MainWindow"];
_libraryWindowController = [[VLCLibraryWindowController alloc] initWithLibraryWindow];
@@ -561,11 +557,6 @@ static VLCMain *sharedInstance = nil;
return _prefs;
}
-- (VLCPlaylist *)playlist
-{
- return _playlist;
-}
-
- (VLCCoreDialogProvider *)coreDialogProvider
{
return _coredialogs;
diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m
index 70e0ca79f158de094ea4f30dada3fe429bea70ed..c3984d48022e05f3aa7660c7bc749274f0797a36 100644
--- a/modules/gui/macosx/VLCMainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -36,7 +36,6 @@
#import "VLCVideoEffectsWindowController.h"
#import "VLCBookmarksWindowController.h"
#import "VLCSimplePrefsController.h"
-#import "VLCPlaylist.h"
#import "VLCPlaylistController.h"
#import "VLCPlaylistInfo.h"
#import "VLCVoutView.h"
diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m
index 1339a5d860809aba87ae6aa469a5f747c39280d0..d5ced4fc6a6f153174cb4e1a3a2f7f1283794a98 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -32,14 +32,12 @@
#import "VLCAudioEffectsWindowController.h"
#import "VLCMainMenu.h"
#import "VLCOpenWindowController.h"
-#import "VLCPlaylist.h"
#import "VLCSourceListItem.h"
#import <math.h>
#import <vlc_playlist_legacy.h>
#import <vlc_url.h>
#import <vlc_strings.h>
#import <vlc_services_discovery.h>
-#import "VLCPLModel.h"
#import "PXSourceList/PXSourceList.h"
#import "PXSourceList/PXSourceListDataSource.h"
@@ -157,12 +155,6 @@ static const float f_min_window_height = 307.;
_nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
b_dropzone_active = YES;
- // Playlist setup
- VLCPlaylist *playlist = [[VLCMain sharedInstance] playlist];
- [playlist setOutlineView:(VLCPlaylistView *)_outlineView];
- [playlist setPlaylistHeaderView:_outlineView.headerView];
- [self setNextResponder:playlist];
-
// (Re)load sidebar for the first time and select first item
[self reloadSidebar];
[_sidebarView selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO];
@@ -670,13 +662,7 @@ static const float f_min_window_height = 307.;
if ([self.fspanel respondsToSelector:@selector(setSeekable:)])
[self.fspanel setSeekable: b_seekable];
- PL_LOCK;
- if ([[[[VLCMain sharedInstance] playlist] model] currentRootType] != ROOT_TYPE_PLAYLIST ||
- [[[[VLCMain sharedInstance] playlist] model] hasChildren])
- [self hideDropZone];
- else
- [self showDropZone];
- PL_UNLOCK;
+ [self showDropZone];
[_sidebarView setNeedsDisplay:YES];
[self _updatePlaylistTitle];
@@ -826,14 +812,6 @@ static const float f_min_window_height = 307.;
#pragma mark private playlist magic
- (void)_updatePlaylistTitle
{
- PLRootType root = [[[[VLCMain sharedInstance] playlist] model] currentRootType];
- playlist_t *p_playlist = pl_Get(getIntf());
-
- PL_LOCK;
- if (root == ROOT_TYPE_PLAYLIST)
- [_categoryLabel setStringValue: [_NS("Playlist") stringByAppendingString:[self _playbackDurationOfNode:p_playlist->p_playing]]];
-
- PL_UNLOCK;
}
- (NSString *)_playbackDurationOfNode:(playlist_item_t*)node
@@ -841,9 +819,6 @@ static const float f_min_window_height = 307.;
if (!node)
return @"";
- playlist_t * p_playlist = pl_Get(getIntf());
- PL_ASSERT_LOCKED;
-
vlc_tick_t mt_duration = playlist_GetNodeDuration( node );
if (mt_duration < 1)
@@ -859,7 +834,6 @@ static const float f_min_window_height = 307.;
- (IBAction)searchItem:(id)sender
{
- [[[[VLCMain sharedInstance] playlist] model] searchUpdate:[_searchField stringValue]];
}
- (IBAction)highlightSearchField:(id)sender
@@ -962,22 +936,7 @@ static const float f_min_window_height = 307.;
[_categoryLabel setStringValue:[item title]];
if ([[item identifier] isEqualToString:@"playlist"]) {
- PL_LOCK;
- [[[[VLCMain sharedInstance] playlist] model] changeRootItem:p_playlist->p_playing];
- PL_UNLOCK;
-
[self _updatePlaylistTitle];
-
- } else {
- PL_LOCK;
- const char *title = [[item title] UTF8String];
- playlist_item_t *pl_item = playlist_ChildSearchName(&p_playlist->root, title);
- if (pl_item)
- [[[[VLCMain sharedInstance] playlist] model] changeRootItem:pl_item];
- else
- msg_Err(getIntf(), "Could not find playlist entry with name %s", title);
-
- PL_UNLOCK;
}
// Note the order: first hide the podcast controls, then show the drop zone
@@ -986,13 +945,7 @@ static const float f_min_window_height = 307.;
else
[self hidePodcastControls];
- PL_LOCK;
- if ([[[[VLCMain sharedInstance] playlist] model] currentRootType] != ROOT_TYPE_PLAYLIST ||
- [[[[VLCMain sharedInstance] playlist] model] hasChildren])
- [self hideDropZone];
- else
- [self showDropZone];
- PL_UNLOCK;
+ [self showDropZone];
[[NSNotificationCenter defaultCenter] postNotificationName: VLCMediaKeySupportSettingChangedNotification
object: nil
@@ -1036,7 +989,7 @@ static const float f_min_window_height = 307.;
{
if ([[item identifier] isEqualToString:@"playlist"]) {
NSPasteboard *o_pasteboard = [info draggingPasteboard];
- if ([[o_pasteboard types] containsObject: VLCPLItemPasteboadType] || [[o_pasteboard types] containsObject: NSFilenamesPboardType])
+ if ([[o_pasteboard types] containsObject: NSFilenamesPboardType])
return NSDragOperationGeneric;
}
return NSDragOperationNone;
@@ -1044,44 +997,7 @@ static const float f_min_window_height = 307.;
- (BOOL)sourceList:(PXSourceList *)aSourceList acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
{
- NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
- playlist_t * p_playlist = pl_Get(getIntf());
- playlist_item_t *p_node;
-
- if ([[item identifier] isEqualToString:@"playlist"])
- p_node = p_playlist->p_playing;
- else {
- msg_Warn(p_playlist, "dragging non-playlist items is not supported");
- return NO;
- }
-
- if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"]) {
- NSArray * array = [[[VLCMain sharedInstance] playlist] draggedItems];
-
- NSUInteger count = [array count];
-
- PL_LOCK;
- for(NSUInteger i = 0; i < count; i++) {
- playlist_item_t *p_item = playlist_ItemGetById(p_playlist, [[array objectAtIndex:i] plItemId]);
- if (!p_item) continue;
- playlist_NodeAddCopy(p_playlist, p_item, p_node, PLAYLIST_END);
- }
- PL_UNLOCK;
-
- return YES;
- }
-
- // check if dropped item is a file
- NSArray *items = [[[VLCMain sharedInstance] playlist] createItemsFromExternalPasteboard:o_pasteboard];
- if (items.count == 0)
- return NO;
-
- [[[VLCMain sharedInstance] playlist] addPlaylistItems:items
- withParentItemId:p_node->i_id
- atPos:-1
- startPlayback:NO];
- return YES;
+ return NO;
}
- (id)sourceList:(PXSourceList *)aSourceList persistentObjectForItem:(id)item
@@ -1162,7 +1078,6 @@ static const float f_min_window_height = 307.;
/* update playlist table */
if (playlist_IsServicesDiscoveryLoaded(p_playlist, "podcast")) {
- [[[VLCMain sharedInstance] playlist] playlistUpdated];
}
}
}
diff --git a/modules/gui/macosx/VLCMainWindowControlsBar.m b/modules/gui/macosx/VLCMainWindowControlsBar.m
index 90a89b92470b76ab190393eb72259352af339e8e..081b933f545e3e12a8868b75dff891cb564084e5 100644
--- a/modules/gui/macosx/VLCMainWindowControlsBar.m
+++ b/modules/gui/macosx/VLCMainWindowControlsBar.m
@@ -26,7 +26,6 @@
#import "VLCMain.h"
#import "VLCCoreInteraction.h"
#import "VLCMainMenu.h"
-#import "VLCPlaylist.h"
#import "CompatibilityFixes.h"
#import <vlc_aout.h>
@@ -140,8 +139,7 @@
if (!var_InheritBool(getIntf(), "macosx-show-playback-buttons"))
[self removeJumpButtons:NO];
- [[[VLCMain sharedInstance] playlist] playbackModeUpdated];
-
+ // FIXME: make sure that buttons appear in the correct state
}
#pragma mark -
diff --git a/modules/gui/macosx/VLCPLItem.h b/modules/gui/macosx/VLCPLItem.h
deleted file mode 100644
index a8243e84898bc43881023dbba180d92685ece418..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPLItem.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * VLCPLItem.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2014 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.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-#include <vlc_common.h>
-
-@interface VLCPLItem : NSObject
-
-@property(readonly, copy) NSMutableArray *children;
-@property(readonly) int plItemId;
-@property(readonly) input_item_t *input;
-@property(readwrite, weak) VLCPLItem *parent;
-
-- (id)initWithPlaylistItem:(playlist_item_t *)p_item;
-
-- (BOOL)isLeaf;
-
-- (void)clear;
-- (void)addChild:(VLCPLItem *)item atPos:(int)pos;
-- (void)deleteChild:(VLCPLItem *)child;
-
-@end
diff --git a/modules/gui/macosx/VLCPLItem.m b/modules/gui/macosx/VLCPLItem.m
deleted file mode 100644
index 803a577a5cf5f8f2db8d504192cccb7711db8981..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPLItem.m
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * VLCPLItem.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2014 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.
- *****************************************************************************/
-
-#import "VLCPLItem.h"
-
-#include <vlc_playlist_legacy.h>
-#include <vlc_input_item.h>
-
-#pragma mark -
-
-@implementation VLCPLItem
-
-- (id)initWithPlaylistItem:(playlist_item_t *)p_item;
-{
- self = [super init];
- if(self) {
- _plItemId = p_item->i_id;
-
- _input = p_item->p_input;
- input_item_Hold(_input);
- _children = [[NSMutableArray alloc] init];
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- input_item_Release(_input);
-}
-
-// own hash and isEqual methods are important to retain expandable state
-// when items are moved / recreated
-- (NSUInteger)hash
-{
- return (NSUInteger)[self plItemId];
-}
-
-- (BOOL)isEqual:(id)other
-{
- if (other == self)
- return YES;
- if (!other || ![other isKindOfClass:[self class]])
- return NO;
- return [self plItemId] == [other plItemId];
-}
-
-- (BOOL)isLeaf
-{
- return [_children count] == 0;
-}
-
-- (void)clear
-{
- [_children removeAllObjects];
-}
-
-- (void)addChild:(VLCPLItem *)item atPos:(int)pos
-{
- [_children insertObject:item atIndex:pos];
- [item setParent: self];
-
-}
-
-- (void)deleteChild:(VLCPLItem *)child
-{
- [child setParent:nil];
- [_children removeObject:child];
-}
-
-@end
diff --git a/modules/gui/macosx/VLCPLModel.h b/modules/gui/macosx/VLCPLModel.h
deleted file mode 100644
index 52586b65e408a3ffeea21d7d823201533d6a5362..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPLModel.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * PLItem.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2014 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.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-#import "VLCPLItem.h"
-
-#include <vlc_common.h>
-
-#define VLCPLItemPasteboadType @"VLCPlaylistItemPboardType"
-
-/* playlist column definitions */
-#define STATUS_COLUMN @"status"
-#define TRACKNUM_COLUMN @"tracknumber"
-#define TITLE_COLUMN @"name"
-#define ARTIST_COLUMN @"artist"
-#define DURATION_COLUMN @"duration"
-#define GENRE_COLUMN @"genre"
-#define ALBUM_COLUMN @"album"
-#define DESCRIPTION_COLUMN @"description"
-#define DATE_COLUMN @"date"
-#define LANGUAGE_COLUMN @"language"
-#define URI_COLUMN @"uri"
-#define FILESIZE_COLUMN @"file-size"
-
-typedef enum {
- ROOT_TYPE_PLAYLIST,
- ROOT_TYPE_OTHER
-} PLRootType;
-
-@interface VLCPLModel : NSObject<NSOutlineViewDataSource>
-
-@property(readonly) VLCPLItem *rootItem;
-@property(readonly, copy) NSArray *draggedItems;
-
-- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root;
-
-- (void)changeRootItem:(playlist_item_t *)p_root;
-
-- (BOOL)hasChildren;
-
-- (PLRootType)currentRootType;
-
-- (BOOL)editAllowed;
-- (void)deleteSelectedItem;
-
-// updates from core
-- (void)addItem:(int)i_item withParentNode:(int)i_node;
-- (void)removeItem:(int)i_item;
-
-- (void)updateItem:(input_item_t *)p_input_item;
-
-- (VLCPLItem *)currentlyPlayingItem;
-
-- (void)playbackModeUpdated;
-
-// sorting / searching
-- (void)sortForColumn:(NSString *)o_column withMode:(int)i_mode;
-
-- (void)searchUpdate:(NSString *)o_search;
-
-@end
diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m
deleted file mode 100644
index f199a394ee2efbb75455c1b206dc2d42705f6c01..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPLModel.m
+++ /dev/null
@@ -1,763 +0,0 @@
-/*****************************************************************************
- * VLCPLItem.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2014 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.
- *****************************************************************************/
-
-#import "VLCPLModel.h"
-
-#import "misc.h" /* VLCByteCountFormatter */
-
-#import "VLCPlaylist.h"
-#import "NSString+Helpers.h"
-#import "VLCMain.h"
-#import "VLCMainWindowControlsBar.h"
-#import "VLCMainMenu.h"
-#import "VLCPlaylistInfo.h"
-#import "VLCMainWindow.h"
-
-#ifdef HAVE_CONFIG_H
-# import "config.h"
-#endif
-#include <assert.h>
-
-#include <vlc_playlist_legacy.h>
-#include <vlc_input_item.h>
-#include <vlc_input.h>
-#include <vlc_url.h>
-
-@interface VLCPLModel ()
-{
- playlist_t *p_playlist;
- __weak NSOutlineView *_outlineView;
-
- NSUInteger _retainedRowSelection;
-}
-
-- (void)VLCPLItemAppended:(NSArray *)valueArray;
-- (void)VLCPLItemRemoved:(NSNumber *)value;
-- (void)VLCPLItemUpdated;
-
-@end
-
-#pragma mark -
-
-static int VLCPLItemUpdated(vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t new_val, void *param)
-{
- @autoreleasepool {
- VLCPLModel *model = (__bridge VLCPLModel*)param;
- [model performSelectorOnMainThread:@selector(VLCPLItemUpdated) withObject:nil waitUntilDone:NO];
-
- return VLC_SUCCESS;
- }
-}
-
-static int VLCPLItemAppended(vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t new_val, void *param)
-{
- @autoreleasepool {
- playlist_item_t *p_item = new_val.p_address;
- int i_node = p_item->p_parent ? p_item->p_parent->i_id : -1;
- NSArray *o_val = [NSArray arrayWithObjects:[NSNumber numberWithInt:i_node], [NSNumber numberWithInt:p_item->i_id], nil];
- VLCPLModel *model = (__bridge VLCPLModel*)param;
- [model performSelectorOnMainThread:@selector(VLCPLItemAppended:) withObject:o_val waitUntilDone:NO];
-
- return VLC_SUCCESS;
- }
-}
-
-static int VLCPLItemRemoved(vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t new_val, void *param)
-{
- @autoreleasepool {
- playlist_item_t *p_item = new_val.p_address;
- NSNumber *o_val = [NSNumber numberWithInt:p_item->i_id];
- VLCPLModel *model = (__bridge VLCPLModel*)param;
- [model performSelectorOnMainThread:@selector(VLCPLItemRemoved:) withObject:o_val waitUntilDone:NO];
-
- return VLC_SUCCESS;
- }
-}
-
-static int PlaybackModeUpdated(vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t new_val, void *param)
-{
- @autoreleasepool {
- VLCPLModel *model = (__bridge VLCPLModel*)param;
- [model performSelectorOnMainThread:@selector(playbackModeUpdated) withObject:nil waitUntilDone:NO];
-
- return VLC_SUCCESS;
- }
-}
-
-static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t new_val, void *param)
-{
- @autoreleasepool {
- dispatch_async(dispatch_get_main_queue(), ^{
- [[[VLCMain sharedInstance] mainWindow] updateVolumeSlider];
- });
-
- return VLC_SUCCESS;
- }
-}
-
-#pragma mark -
-
-@implementation VLCPLModel
-
-#pragma mark -
-#pragma mark Init and Stuff
-
-- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root;
-{
- self = [super init];
- if (self) {
- p_playlist = pl;
- _outlineView = outlineView;
-
- msg_Dbg(getIntf(), "Initializing playlist model");
- var_AddCallback(p_playlist, "item-change", VLCPLItemUpdated, (__bridge void *)self);
- var_AddCallback(p_playlist, "playlist-item-append", VLCPLItemAppended, (__bridge void *)self);
- var_AddCallback(p_playlist, "playlist-item-deleted", VLCPLItemRemoved, (__bridge void *)self);
- var_AddCallback(p_playlist, "random", PlaybackModeUpdated, (__bridge void *)self);
- var_AddCallback(p_playlist, "repeat", PlaybackModeUpdated, (__bridge void *)self);
- var_AddCallback(p_playlist, "loop", PlaybackModeUpdated, (__bridge void *)self);
- var_AddCallback(p_playlist, "volume", VolumeUpdated, (__bridge void *)self);
- var_AddCallback(p_playlist, "mute", VolumeUpdated, (__bridge void *)self);
-
- PL_LOCK;
- _rootItem = [[VLCPLItem alloc] initWithPlaylistItem:root];
- [self rebuildVLCPLItem:_rootItem];
- PL_UNLOCK;
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- msg_Dbg(getIntf(), "Deinitializing playlist model");
- var_DelCallback(p_playlist, "item-change", VLCPLItemUpdated, (__bridge void *)self);
- var_DelCallback(p_playlist, "playlist-item-append", VLCPLItemAppended, (__bridge void *)self);
- var_DelCallback(p_playlist, "playlist-item-deleted", VLCPLItemRemoved, (__bridge void *)self);
- var_DelCallback(p_playlist, "random", PlaybackModeUpdated, (__bridge void *)self);
- var_DelCallback(p_playlist, "repeat", PlaybackModeUpdated, (__bridge void *)self);
- var_DelCallback(p_playlist, "loop", PlaybackModeUpdated, (__bridge void *)self);
- var_DelCallback(p_playlist, "volume", VolumeUpdated, (__bridge void *)self);
- var_DelCallback(p_playlist, "mute", VolumeUpdated, (__bridge void *)self);
-}
-
-- (void)changeRootItem:(playlist_item_t *)p_root;
-{
- PL_ASSERT_LOCKED;
- _rootItem = [[VLCPLItem alloc] initWithPlaylistItem:p_root];
- [self rebuildVLCPLItem:_rootItem];
-
- [_outlineView reloadData];
- [_outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
-}
-
-- (BOOL)hasChildren
-{
- return [[_rootItem children] count] > 0;
-}
-
-- (PLRootType)currentRootType
-{
- int i_root_id = [_rootItem plItemId];
- if (i_root_id == p_playlist->p_playing->i_id)
- return ROOT_TYPE_PLAYLIST;
-
- return ROOT_TYPE_OTHER;
-}
-
-- (BOOL)editAllowed
-{
- return [self currentRootType] == ROOT_TYPE_PLAYLIST;
-}
-
-- (void)deleteSelectedItem
-{
- // check if deletion is allowed
- if (![self editAllowed])
- return;
-
- NSIndexSet *selectedIndexes = [_outlineView selectedRowIndexes];
- _retainedRowSelection = [selectedIndexes firstIndex];
- if (_retainedRowSelection == NSNotFound)
- _retainedRowSelection = 0;
-
- [selectedIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
- VLCPLItem *item = [self->_outlineView itemAtRow: idx];
- if (!item)
- return;
-
- // model deletion is done via callback
- playlist_Lock( self->p_playlist );
- playlist_item_t *p_root = playlist_ItemGetById(self->p_playlist, [item plItemId]);
- if( p_root != NULL )
- playlist_NodeDelete(self->p_playlist, p_root);
- playlist_Unlock( self->p_playlist );
- }];
-}
-
-- (void)rebuildVLCPLItem:(VLCPLItem *)item
-{
- [item clear];
- playlist_item_t *p_item = playlist_ItemGetById(p_playlist, [item plItemId]);
- if (p_item) {
- int currPos = 0;
- for(int i = 0; i < p_item->i_children; ++i) {
- playlist_item_t *p_child = p_item->pp_children[i];
-
- if (p_child->i_flags & PLAYLIST_DBL_FLAG)
- continue;
-
- VLCPLItem *child = [[VLCPLItem alloc] initWithPlaylistItem:p_child];
- [item addChild:child atPos:currPos++];
-
- if (p_child->i_children >= 0) {
- [self rebuildVLCPLItem:child];
- }
-
- }
- }
-
-}
-
-- (VLCPLItem *)findItemByPlaylistId:(int)i_pl_id
-{
- return [self findItemInnerByPlaylistId:i_pl_id node:_rootItem];
-}
-
-- (VLCPLItem *)findItemInnerByPlaylistId:(int)i_pl_id node:(VLCPLItem *)node
-{
- if ([node plItemId] == i_pl_id) {
- return node;
- }
-
- for (NSUInteger i = 0; i < [[node children] count]; ++i) {
- VLCPLItem *o_sub_item = [[node children] objectAtIndex:i];
- if ([o_sub_item plItemId] == i_pl_id) {
- return o_sub_item;
- }
-
- if (![o_sub_item isLeaf]) {
- VLCPLItem *o_returned = [self findItemInnerByPlaylistId:i_pl_id node:o_sub_item];
- if (o_returned)
- return o_returned;
- }
- }
-
- return nil;
-}
-
-#pragma mark -
-#pragma mark Core events
-
-
-- (void)VLCPLItemAppended:(NSArray *)valueArray
-{
- int i_node = [[valueArray firstObject] intValue];
- int i_item = [[valueArray objectAtIndex:1] intValue];
-
- [self addItem:i_item withParentNode:i_node];
-
- // update badge in sidebar
- [[[VLCMain sharedInstance] mainWindow] updateWindow];
-
- [[NSNotificationCenter defaultCenter] postNotificationName: VLCMediaKeySupportSettingChangedNotification
- object: nil
- userInfo: nil];
-}
-
-- (void)VLCPLItemRemoved:(NSNumber *)value
-{
- int i_item = [value intValue];
-
- [self removeItem:i_item];
- // retain selection before deletion
- [_outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:_retainedRowSelection] byExtendingSelection:NO];
-
- // update badge in sidebar
- [[[VLCMain sharedInstance] mainWindow] updateWindow];
-
- [[NSNotificationCenter defaultCenter] postNotificationName: VLCMediaKeySupportSettingChangedNotification
- object: nil
- userInfo: nil];
-}
-
-- (void)VLCPLItemUpdated
-{
- VLCMain *instance = [VLCMain sharedInstance];
- [[instance mainWindow] updateName];
-
- [[instance currentMediaInfoPanel] updateMetadata];
-}
-
-- (void)addItem:(int)i_item withParentNode:(int)i_node
-{
- VLCPLItem *o_parent = [self findItemByPlaylistId:i_node];
- if (!o_parent) {
- return;
- }
-
- PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById(p_playlist, i_item);
- if (!p_item || p_item->i_flags & PLAYLIST_DBL_FLAG)
- {
- PL_UNLOCK;
- return;
- }
-
- int pos;
- for(pos = p_item->p_parent->i_children - 1; pos >= 0; pos--)
- if(p_item->p_parent->pp_children[pos] == p_item)
- break;
-
- VLCPLItem *o_new_item = [[VLCPLItem alloc] initWithPlaylistItem:p_item];
- PL_UNLOCK;
- if (pos < 0)
- return;
-
- [o_parent addChild:o_new_item atPos:pos];
-
- if ([o_parent plItemId] == [_rootItem plItemId])
- [_outlineView reloadData];
- else // only reload leafs this way, doing it with nil collapses width of title column
- [_outlineView reloadItem:o_parent reloadChildren:YES];
-}
-
-- (void)removeItem:(int)i_item
-{
- VLCPLItem *o_item = [self findItemByPlaylistId:i_item];
- if (!o_item) {
- return;
- }
-
- VLCPLItem *o_parent = [o_item parent];
- [o_parent deleteChild:o_item];
-
- if ([o_parent plItemId] == [_rootItem plItemId])
- [_outlineView reloadData];
- else
- [_outlineView reloadItem:o_parent reloadChildren:YES];
-}
-
-- (void)updateItem:(input_item_t *)p_input_item
-{
- PL_LOCK;
- playlist_item_t *pl_item = playlist_ItemGetByInput(p_playlist, p_input_item);
- if (!pl_item) {
- PL_UNLOCK;
- return;
- }
- VLCPLItem *item = [self findItemByPlaylistId:pl_item->i_id];
- PL_UNLOCK;
-
- if (!item)
- return;
-
- NSInteger row = [_outlineView rowForItem:item];
- if (row == -1)
- return;
-
- [_outlineView reloadDataForRowIndexes:[NSIndexSet indexSetWithIndex:row]
- columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [[_outlineView tableColumns] count])]];
-
-}
-
-- (VLCPLItem *)currentlyPlayingItem
-{
- VLCPLItem *item = nil;
-
- PL_LOCK;
- playlist_item_t *p_current = playlist_CurrentPlayingItem(p_playlist);
- if (p_current)
- item = [self findItemByPlaylistId:p_current->i_id];
- PL_UNLOCK;
- return item;
-}
-
-- (void)playbackModeUpdated
-{
- bool loop = var_GetBool(p_playlist, "loop");
- bool repeat = var_GetBool(p_playlist, "repeat");
-
- VLCMainWindowControlsBar *controlsBar = (VLCMainWindowControlsBar *)[[[VLCMain sharedInstance] mainWindow] controlsBar];
- VLCMainMenu *mainMenu = [[VLCMain sharedInstance] mainMenu];
- if (repeat) {
- [controlsBar setRepeatOne];
- [mainMenu setRepeatOne];
- } else if (loop) {
- [controlsBar setRepeatAll];
- [mainMenu setRepeatAll];
- } else {
- [controlsBar setRepeatOff];
- [mainMenu setRepeatOff];
- }
-
- [controlsBar setShuffle];
- [mainMenu setShuffle];
-}
-
-#pragma mark -
-#pragma mark Sorting / Searching
-
-- (void)sortForColumn:(NSString *)o_column withMode:(int)i_mode
-{
- int i_column = 0;
- if ([o_column isEqualToString:TRACKNUM_COLUMN])
- i_column = SORT_TRACK_NUMBER;
- else if ([o_column isEqualToString:TITLE_COLUMN])
- i_column = SORT_TITLE;
- else if ([o_column isEqualToString:ARTIST_COLUMN])
- i_column = SORT_ARTIST;
- else if ([o_column isEqualToString:GENRE_COLUMN])
- i_column = SORT_GENRE;
- else if ([o_column isEqualToString:DURATION_COLUMN])
- i_column = SORT_DURATION;
- else if ([o_column isEqualToString:ALBUM_COLUMN])
- i_column = SORT_ALBUM;
- else if ([o_column isEqualToString:DESCRIPTION_COLUMN])
- i_column = SORT_DESCRIPTION;
- else if ([o_column isEqualToString:URI_COLUMN])
- i_column = SORT_URI;
- else
- return;
-
- PL_LOCK;
- playlist_item_t *p_root = playlist_ItemGetById(p_playlist, [_rootItem plItemId]);
- if (!p_root) {
- PL_UNLOCK;
- return;
- }
-
- playlist_RecursiveNodeSort(p_playlist, p_root, i_column, i_mode);
-
- [self rebuildVLCPLItem:_rootItem];
- [_outlineView reloadData];
- PL_UNLOCK;
-}
-
-- (void)searchUpdate:(NSString *)o_search
-{
- PL_LOCK;
- playlist_item_t *p_root = playlist_ItemGetById(p_playlist, [_rootItem plItemId]);
- if (!p_root) {
- PL_UNLOCK;
- return;
- }
- playlist_LiveSearchUpdate(p_playlist, p_root, [o_search UTF8String],
- true);
- [self rebuildVLCPLItem:_rootItem];
- [_outlineView reloadData];
- PL_UNLOCK;
-}
-
-@end
-
-#pragma mark -
-#pragma mark Outline view data source
-
-@implementation VLCPLModel(NSOutlineViewDataSource)
-
-- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
-{
- return !item ? [[_rootItem children] count] : [[item children] count];
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
-{
- return !item ? YES : [[item children] count] > 0;
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
-{
- id obj = !item ? _rootItem : item;
- return [[obj children] objectAtIndex:index];
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
- id o_value = nil;
- char *psz_value;
-
- input_item_t *p_input = [item input];
-
- NSString * o_identifier = [tableColumn identifier];
-
- if ([o_identifier isEqualToString:TRACKNUM_COLUMN]) {
- psz_value = input_item_GetTrackNumber(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:TITLE_COLUMN]) {
- psz_value = input_item_GetTitleFbName(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:ARTIST_COLUMN]) {
- psz_value = input_item_GetArtist(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:DURATION_COLUMN]) {
- char psz_duration[MSTRTIME_MAX_SIZE];
- vlc_tick_t dur = input_item_GetDuration(p_input);
- if (dur != -1) {
- secstotimestr(psz_duration, (int32_t)SEC_FROM_VLC_TICK(dur));
- o_value = toNSStr(psz_duration);
- }
- else
- o_value = @"--:--";
-
- } else if ([o_identifier isEqualToString:GENRE_COLUMN]) {
- psz_value = input_item_GetGenre(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:ALBUM_COLUMN]) {
- psz_value = input_item_GetAlbum(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:DESCRIPTION_COLUMN]) {
- psz_value = input_item_GetDescription(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:DATE_COLUMN]) {
- psz_value = input_item_GetDate(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:LANGUAGE_COLUMN]) {
- psz_value = input_item_GetLanguage(p_input);
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:URI_COLUMN]) {
- psz_value = vlc_uri_decode(input_item_GetURI(p_input));
- o_value = toNSStr(psz_value);
- free(psz_value);
-
- } else if ([o_identifier isEqualToString:FILESIZE_COLUMN]) {
- psz_value = input_item_GetURI(p_input);
- if (!psz_value)
- return @"";
- NSURL *url = [NSURL URLWithString:toNSStr(psz_value)];
- free(psz_value);
- if (![url isFileURL])
- return @"";
-
- NSFileManager *fileManager = [NSFileManager defaultManager];
- BOOL b_isDir;
- if (![fileManager fileExistsAtPath:[url path] isDirectory:&b_isDir] || b_isDir)
- return @"";
-
- NSDictionary *attributes = [fileManager attributesOfItemAtPath:[url path] error:nil];
- if (!attributes)
- return @"";
-
- o_value = [VLCByteCountFormatter stringFromByteCount:[attributes fileSize] countStyle:NSByteCountFormatterCountStyleDecimal];
-
- } else if ([o_identifier isEqualToString:STATUS_COLUMN]) {
- if (input_item_HasErrorWhenReading(p_input)) {
- o_value = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kAlertCautionIcon)];
- [o_value setSize: NSMakeSize(16,16)];
- }
- }
-
- return o_value;
-}
-
-#pragma mark -
-#pragma mark Drag and Drop support
-
-- (BOOL)isItem: (VLCPLItem *)p_item inNode: (VLCPLItem *)p_node
-{
- while(p_item) {
- if ([p_item plItemId] == [p_node plItemId]) {
- return YES;
- }
-
- p_item = [p_item parent];
- }
-
- return NO;
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
-{
- _draggedItems = [[NSMutableArray alloc] initWithArray:items];
-
- /* Add the data to the pasteboard object. */
- [pboard declareTypes: [NSArray arrayWithObject:VLCPLItemPasteboadType] owner: self];
- [pboard setData:[NSData data] forType:VLCPLItemPasteboadType];
-
- return YES;
-}
-
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
-{
- NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
- /* Dropping ON items is not allowed if item is not a node */
- if (item) {
- if (index == NSOutlineViewDropOnItemIndex && [item isLeaf]) {
- return NSDragOperationNone;
- }
- }
-
- if (![self editAllowed])
- return NSDragOperationNone;
-
- /* Drop from the Playlist */
- if ([[o_pasteboard types] containsObject:VLCPLItemPasteboadType]) {
- NSUInteger count = [_draggedItems count];
- for (NSUInteger i = 0 ; i < count ; i++) {
- /* We refuse to Drop in a child of an item we are moving */
- if ([self isItem: item inNode: [_draggedItems objectAtIndex:i]]) {
- return NSDragOperationNone;
- }
- }
- return NSDragOperationMove;
- }
- /* Drop from the Finder */
- else if ([[o_pasteboard types] containsObject: NSFilenamesPboardType]) {
- return NSDragOperationGeneric;
- }
- return NSDragOperationNone;
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)targetItem childIndex:(NSInteger)index
-{
- NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
- if (targetItem == nil) {
- targetItem = _rootItem;
- }
-
- /* Drag & Drop inside the playlist */
- if ([[o_pasteboard types] containsObject:VLCPLItemPasteboadType]) {
-
- NSMutableArray *o_filteredItems = [NSMutableArray arrayWithArray:_draggedItems];
- const NSUInteger draggedItemsCount = [_draggedItems count];
- for (NSInteger i = 0; i < [o_filteredItems count]; i++) {
- for (NSUInteger j = 0; j < draggedItemsCount; j++) {
- VLCPLItem *itemToCheck = [o_filteredItems objectAtIndex:i];
- VLCPLItem *nodeToTest = [_draggedItems objectAtIndex:j];
- if ([itemToCheck plItemId] == [nodeToTest plItemId])
- continue;
-
- if ([self isItem:itemToCheck inNode:nodeToTest]) {
- [o_filteredItems removeObjectAtIndex:i];
- --i;
- break;
- }
- }
- }
-
- NSUInteger count = [o_filteredItems count];
- if (count == 0)
- return NO;
-
- playlist_item_t **pp_items = (playlist_item_t **)calloc(count, sizeof(playlist_item_t*));
- if (!pp_items)
- return NO;
-
- PL_LOCK;
- playlist_item_t *p_new_parent = playlist_ItemGetById(p_playlist, [targetItem plItemId]);
- if (!p_new_parent) {
- PL_UNLOCK;
- free(pp_items);
- return NO;
- }
-
- int j = 0;
- for (int i = 0; i < count; i++) {
- playlist_item_t *p_item = playlist_ItemGetById(p_playlist, [[o_filteredItems objectAtIndex:i] plItemId]);
- if (p_item)
- pp_items[j++] = p_item;
- }
-
- // drop on a node itself will append entries at the end
- if (index == NSOutlineViewDropOnItemIndex)
- index = p_new_parent->i_children;
-
- if (playlist_TreeMoveMany(p_playlist, j, pp_items, p_new_parent, (int)index) != VLC_SUCCESS) {
- PL_UNLOCK;
- free(pp_items);
- return NO;
- }
-
- PL_UNLOCK;
- free(pp_items);
-
- // FIXME: Fix below code to avoid rebuilding the whole model
- // rebuild our model
-// NSUInteger filteredItemsCount = [o_filteredItems count];
-// for(int i = 0; i < filteredItemsCount; ++i) {
-// VLCPLItem *o_item = [o_filteredItems objectAtIndex:i];
-// NSLog(@"delete child from parent %p", [o_item parent]);
-// [[o_item parent] deleteChild:o_item];
-// [targetItem addChild:o_item atPos:(int)index + i];
-// }
-
- PL_LOCK;
- [self rebuildVLCPLItem:_rootItem];
- PL_UNLOCK;
-
- [_outlineView reloadData];
-
- NSMutableIndexSet *selectedIndexes = [[NSMutableIndexSet alloc] init];
- for(NSUInteger i = 0; i < draggedItemsCount; ++i) {
- NSInteger row = [_outlineView rowForItem:[_draggedItems objectAtIndex:i]];
- if (row < 0)
- continue;
-
- [selectedIndexes addIndex:row];
- }
-
- if ([selectedIndexes count] == 0)
- [selectedIndexes addIndex:[_outlineView rowForItem:targetItem]];
-
- [_outlineView selectRowIndexes:selectedIndexes byExtendingSelection:NO];
-
- return YES;
- }
-
- // try file drop
-
- // drop on a node itself will append entries at the end
- static_assert(NSOutlineViewDropOnItemIndex == -1, "Expect NSOutlineViewDropOnItemIndex to be -1");
-
- NSArray *items = [[[VLCMain sharedInstance] playlist] createItemsFromExternalPasteboard:o_pasteboard];
- if (items.count == 0)
- return NO;
-
- [[[VLCMain sharedInstance] playlist] addPlaylistItems:items
- withParentItemId:[targetItem plItemId]
- atPos:(int)index
- startPlayback:NO];
- return YES;
-}
-
-@end
diff --git a/modules/gui/macosx/VLCPlaylist.h b/modules/gui/macosx/VLCPlaylist.h
deleted file mode 100644
index e499bfe3323c99217842a66fbe7a98befeca1adf..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPlaylist.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************
- * VLCPlaylist.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2015 VLC authors and VideoLAN
- *
- * Authors: Benjamin Pracht <bigben at videolab dot org>
- * Felix Paul Kühne <fkuehne at videolan dot org>
- * David Fuhrmann <david dot fuhrmann at googlemail dot com>
- *
- * 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.
- *****************************************************************************/
-
-#import "VLCPLModel.h"
-#import "VLCPlaylistView.h"
-
-@interface VLCPlaylist : NSResponder<NSOutlineViewDelegate>
-
-@property (readwrite, strong) IBOutlet NSMenu *playlistMenu;
-@property (readwrite, weak) IBOutlet NSMenuItem *playPlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *deletePlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *infoPlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *revealInFinderPlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *selectAllPlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *recursiveExpandPlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *recursiveCollapsePlaylistMenuItem;
-@property (readwrite, weak) IBOutlet NSMenuItem *addFilesToPlaylistMenuItem;
-
-@property (nonatomic, readwrite, weak) VLCPlaylistView *outlineView;
-@property (nonatomic, readwrite, weak) NSTableHeaderView *playlistHeaderView;
-
-- (VLCPLModel *)model;
-
-- (void)reloadStyles;
-
-- (NSMenu *)menuForEvent:(NSEvent *)o_event;
-
-- (void)playlistUpdated;
-- (void)playbackModeUpdated;
-
-- (void)currentlyPlayingItemChanged;
-
-- (BOOL)isSelectionEmpty;
-
-- (IBAction)playItem:(id)sender;
-- (IBAction)revealItemInFinder:(id)sender;
-- (IBAction)deleteItem:(id)sender;
-- (IBAction)selectAll:(id)sender;
-- (IBAction)recursiveExpandOrCollapseNode:(id)sender;
-- (IBAction)showInfoPanel:(id)sender;
-- (IBAction)addFilesToPlaylist:(id)sender;
-
-- (NSArray *)draggedItems;
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
-
-/**
- * Prepares an array of playlist items for all suitable pasteboard types.
- *
- * This function checks external pasteboard objects (like files). If suitable,
- * an array of all objects is prepared.
- */
-- (NSArray *)createItemsFromExternalPasteboard:(NSPasteboard *)pasteboard;
-
-/**
- * Simplified version to add new items at the end of the current playlist
- * @param array array of items. Each item is a Dictionary with meta info.
- */
-- (void)addPlaylistItems:(NSArray*)array;
-
-/**
- * Add new items to playlist, with the possibility to check if an item can be added
- * to the currently playing media as subtitle.
- *
- * @param array array of items. Each item is a Dictionary with meta info.
- * @param isSubtitle if YES, method tries to add the item as a subtitle
- */
-- (void)addPlaylistItems:(NSArray*)array tryAsSubtitle:(BOOL)isSubtitle;
-
-/**
- * Adds new items to the playlist, at specified parent node and index.
- * @param o_array array of items. Each item is a Dictionary with meta info.
- * @param i_plItemId parent playlist node id, -1 for default playlist
- * @param i_position index for new items, -1 for appending at end
- * @param b_start starts playback of first item if true
- */
-- (void)addPlaylistItems:(NSArray*)o_array withParentItemId:(int)i_plItemId atPos:(int)i_position startPlayback:(BOOL)b_start;
-
-@end
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
deleted file mode 100644
index af526615b0eb9b46b958f8565e4622cfc4db4966..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPlaylist.m
+++ /dev/null
@@ -1,777 +0,0 @@
-/*****************************************************************************
- * VLCPlaylist.m: MacOS X interface module
- *****************************************************************************
-* Copyright (C) 2002-2015 VLC authors and VideoLAN
- *
- * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
- * Benjamin Pracht <bigben at videolan dot org>
- * Felix Paul Kühne <fkuehne at videolan dot org>
- * David Fuhrmann <david dot fuhrmann at googlemail dot com>
- *
- * 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.
- *****************************************************************************/
-
-/* TODO
- * add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
- * reimplement enable/disable item
- */
-
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <sys/param.h> /* for MAXPATHLEN */
-#include <string.h>
-#include <math.h>
-#include <sys/mount.h>
-
-#import "CompatibilityFixes.h"
-
-#import "VLCMain.h"
-#import "VLCPlaylist.h"
-#import "VLCMainMenu.h"
-#import "VLCPlaylistInfo.h"
-#import "VLCResumeDialogController.h"
-#import "VLCOpenWindowController.h"
-
-#import "PXSourceList/PXSourceList.h"
-
-#include <vlc_actions.h>
-#import <vlc_interface.h>
-#include <vlc_url.h>
-
-@interface VLCPlaylist ()
-{
- NSImage *_descendingSortingImage;
- NSImage *_ascendingSortingImage;
-
- BOOL b_selected_item_met;
- BOOL b_isSortDescending;
- NSTableColumn *_sortTableColumn;
-
- BOOL b_playlistmenu_nib_loaded;
-
- VLCPLModel *_model;
-
- // information for playlist table columns menu
-
- NSDictionary *_translationsForPlaylistTableColumns;
- NSArray *_menuOrderOfPlaylistTableColumns;
-}
-
-- (void)saveTableColumns;
-@end
-
-@implementation VLCPlaylist
-
-- (id)init
-{
- self = [super init];
- if (self) {
- _ascendingSortingImage = [NSImage imageNamed:@"NSAscendingSortIndicator"];
- _descendingSortingImage = [NSImage imageNamed:@"NSDescendingSortIndicator"];
-
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
-
-
- _translationsForPlaylistTableColumns = [[NSDictionary alloc] initWithObjectsAndKeys:
- _NS("Track Number"), TRACKNUM_COLUMN,
- _NS("Title"), TITLE_COLUMN,
- _NS("Author"), ARTIST_COLUMN,
- _NS("Duration"), DURATION_COLUMN,
- _NS("Genre"), GENRE_COLUMN,
- _NS("Album"), ALBUM_COLUMN,
- _NS("Description"), DESCRIPTION_COLUMN,
- _NS("Date"), DATE_COLUMN,
- _NS("Language"), LANGUAGE_COLUMN,
- _NS("URI"), URI_COLUMN,
- _NS("File Size"), FILESIZE_COLUMN,
- nil];
- // this array also assigns tags (index) to type of menu item
- _menuOrderOfPlaylistTableColumns = [[NSArray alloc] initWithObjects: TRACKNUM_COLUMN, TITLE_COLUMN,
- ARTIST_COLUMN, DURATION_COLUMN, GENRE_COLUMN, ALBUM_COLUMN,
- DESCRIPTION_COLUMN, DATE_COLUMN, LANGUAGE_COLUMN, URI_COLUMN,
- FILESIZE_COLUMN,nil];
-
- }
- return self;
-}
-
-+ (void)initialize
-{
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSMutableArray *columnArray = [[NSMutableArray alloc] init];
- [columnArray addObject: [NSArray arrayWithObjects:TITLE_COLUMN, [NSNumber numberWithFloat:190.], nil]];
- [columnArray addObject: [NSArray arrayWithObjects:ARTIST_COLUMN, [NSNumber numberWithFloat:95.], nil]];
- [columnArray addObject: [NSArray arrayWithObjects:DURATION_COLUMN, [NSNumber numberWithFloat:95.], nil]];
-
- NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSArray arrayWithArray:columnArray], @"PlaylistColumnSelection", nil];
-
- [defaults registerDefaults:appDefaults];
-}
-
-- (VLCPLModel *)model
-{
- return _model;
-}
-
-- (void)reloadStyles
-{
- NSFont *fontToUse;
- CGFloat rowHeight;
- if (var_InheritBool(getIntf(), "macosx-large-text")) {
- fontToUse = [NSFont systemFontOfSize:13.];
- rowHeight = 21.;
- } else {
- fontToUse = [NSFont systemFontOfSize:11.];
- rowHeight = 16.;
- }
-
- NSArray *columns = [_outlineView tableColumns];
- NSUInteger count = columns.count;
- for (NSUInteger x = 0; x < count; x++)
- [[[columns objectAtIndex:x] dataCell] setFont:fontToUse];
- [_outlineView setRowHeight:rowHeight];
-}
-
-- (void)awakeFromNib
-{
- // This is only called for the playlist popup menu
- [self initStrings];
-}
-
-- (void)setOutlineView:(VLCPlaylistView * __nullable)outlineView
-{
- _outlineView = outlineView;
- [_outlineView setDelegate:self];
-
- playlist_t * p_playlist = pl_Get(getIntf());
-
- _model = [[VLCPLModel alloc] initWithOutlineView:_outlineView playlist:p_playlist rootItem:p_playlist->p_playing];
- [_outlineView setDataSource:_model];
- [_outlineView reloadData];
-
- [_outlineView setTarget: self];
- [_outlineView setDoubleAction: @selector(playItem:)];
-
- [_outlineView setAllowsEmptySelection: NO];
- [_outlineView registerForDraggedTypes: [NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
- [_outlineView setIntercellSpacing: NSMakeSize (0.0, 1.0)];
-
- [self reloadStyles];
-}
-
-- (void)setPlaylistHeaderView:(NSTableHeaderView * __nullable)playlistHeaderView
-{
- _playlistHeaderView = playlistHeaderView;
-
- // Setup playlist table column selection for both context and main menu
- NSMenu *contextMenu = [[NSMenu alloc] init];
- [self setupPlaylistTableColumnsForMenu:contextMenu];
- [_playlistHeaderView setMenu:contextMenu];
- [self setupPlaylistTableColumnsForMenu:[[[VLCMain sharedInstance] mainMenu] playlistTableColumnsMenu]];
-
- NSArray *columnArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"PlaylistColumnSelection"];
-
- BOOL hasTitleItem = NO;
-
- for (NSArray *column in columnArray) {
- NSString *columnName = column[0];
- NSNumber *columnWidth = column[1];
-
- if ([columnName isEqualToString:STATUS_COLUMN])
- continue;
-
- // Memorize if we custom set always-enabled title item
- if ([columnName isEqualToString:TITLE_COLUMN]) {
- hasTitleItem = YES;
- }
-
- if(![self setPlaylistColumnTableState: NSOnState forColumn:columnName])
- continue;
-
- [[_outlineView tableColumnWithIdentifier:columnName] setWidth:[columnWidth floatValue]];
- }
-
- // Set the always enabled title item if not already done
- if (!hasTitleItem)
- [self setPlaylistColumnTableState:NSOnState forColumn:TITLE_COLUMN];
-}
-
-- (void)applicationWillTerminate:(NSNotification *)notification
-{
- /* let's make sure we save the correct widths and positions, since this likely changed since the last time the user played with the column selection */
- [self saveTableColumns];
-}
-
-- (void)initStrings
-{
- [_playPlaylistMenuItem setTitle: _NS("Play")];
- [_deletePlaylistMenuItem setTitle: _NS("Delete")];
- [_recursiveExpandPlaylistMenuItem setTitle: _NS("Expand All")];
- [_recursiveCollapsePlaylistMenuItem setTitle: _NS("Collapse All")];
- [_selectAllPlaylistMenuItem setTitle: _NS("Select All")];
- [_infoPlaylistMenuItem setTitle: _NS("Media Information...")];
- [_revealInFinderPlaylistMenuItem setTitle: _NS("Reveal in Finder")];
- [_addFilesToPlaylistMenuItem setTitle: _NS("Add File...")];
-}
-
-- (void)playlistUpdated
-{
- [_outlineView reloadData];
-}
-
-- (void)playbackModeUpdated
-{
- [_model playbackModeUpdated];
-}
-
-
-- (BOOL)isSelectionEmpty
-{
- return [_outlineView selectedRow] == -1;
-}
-
-- (void)currentlyPlayingItemChanged
-{
- VLCPLItem *item = [[self model] currentlyPlayingItem];
- if (!item)
- return;
-
- // Search for item row for selection
- NSInteger itemIndex = [_outlineView rowForItem:item];
- if (itemIndex < 0) {
- // Expand if needed. This must be done from root to child
- // item in order to work
- NSMutableArray *itemsToExpand = [NSMutableArray array];
- VLCPLItem *tmpItem = [item parent];
- while (tmpItem != nil) {
- [itemsToExpand addObject:tmpItem];
- tmpItem = [tmpItem parent];
- }
-
- for(int i = (int)itemsToExpand.count - 1; i >= 0; i--) {
- VLCPLItem *currentItem = [itemsToExpand objectAtIndex:i];
- [_outlineView expandItem: currentItem];
- }
- }
-
- // Update highlight for currently playing item
- [_outlineView reloadData];
-
- // Search for row again
- itemIndex = [_outlineView rowForItem:item];
- if (itemIndex < 0) {
- return;
- }
-
- [_outlineView selectRowIndexes: [NSIndexSet indexSetWithIndex: itemIndex] byExtendingSelection: NO];
- [_outlineView scrollRowToVisible: itemIndex];
-}
-
-#pragma mark -
-#pragma mark Playlist actions
-
-/* When called retrieves the selected outlineview row and plays that node or item */
-- (IBAction)playItem:(id)sender
-{
- playlist_t *p_playlist = pl_Get(getIntf());
-
- // ignore clicks on column header when handling double action
- if (sender == _outlineView && [_outlineView clickedRow] == -1)
- return;
-
- VLCPLItem *o_item = [_outlineView itemAtRow:[_outlineView selectedRow]];
- if (!o_item)
- return;
-
- PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById(p_playlist, [o_item plItemId]);
- playlist_item_t *p_node = playlist_ItemGetById(p_playlist, [[[self model] rootItem] plItemId]);
-
- if (p_item && p_node) {
- playlist_ViewPlay(p_playlist, p_node, p_item);
- }
- PL_UNLOCK;
-}
-
-- (IBAction)revealItemInFinder:(id)sender
-{
- NSIndexSet *selectedRows = [_outlineView selectedRowIndexes];
- if (selectedRows.count < 1)
- return;
-
- VLCPLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
-
- char *psz_url = input_item_GetURI([o_item input]);
- if (!psz_url)
- return;
- char *psz_path = vlc_uri2path(psz_url);
- NSString *path = toNSStr(psz_path);
- free(psz_url);
- free(psz_path);
-
- msg_Dbg(getIntf(), "Reveal url %s in finder", [path UTF8String]);
- [[NSWorkspace sharedWorkspace] selectFile: path inFileViewerRootedAtPath: path];
-}
-
-- (IBAction)selectAll:(id)sender
-{
- [_outlineView selectAll: nil];
-}
-
-- (IBAction)showInfoPanel:(id)sender
-{
- [[[VLCMain sharedInstance] currentMediaInfoPanel] toggleWindow:sender];
-}
-
-- (IBAction)addFilesToPlaylist:(id)sender
-{
- NSIndexSet *selectedRows = [_outlineView selectedRowIndexes];
-
- int position = -1;
- VLCPLItem *parentItem = [[self model] rootItem];
-
- if (selectedRows.count >= 1) {
- position = (int)selectedRows.firstIndex + 1;
- parentItem = [_outlineView itemAtRow:selectedRows.firstIndex];
- if ([parentItem parent] != nil)
- parentItem = [parentItem parent];
- }
-
- [[[VLCMain sharedInstance] open] openFileWithAction:^(NSArray *files) {
- [self addPlaylistItems:files
- withParentItemId:[parentItem plItemId]
- atPos:position
- startPlayback:NO];
- }];
-}
-
-- (IBAction)deleteItem:(id)sender
-{
- [_model deleteSelectedItem];
- [[[[VLCMain sharedInstance] mainWindow] sidebarView] performSelector:@selector(reloadData) withObject:nil afterDelay:0.15];
-}
-
-// Actions for playlist column selections
-
-
-- (void)togglePlaylistColumnTable:(id)sender
-{
- NSInteger i_new_state = ![sender state];
- NSInteger i_tag = [sender tag];
-
- NSString *column = [_menuOrderOfPlaylistTableColumns objectAtIndex:i_tag];
-
- [self setPlaylistColumnTableState:i_new_state forColumn:column];
-}
-
-- (BOOL)setPlaylistColumnTableState:(NSInteger)i_state forColumn:(NSString *)columnId
-{
- NSUInteger i_tag = [_menuOrderOfPlaylistTableColumns indexOfObject: columnId];
- // prevent setting unknown columns
- if(i_tag == NSNotFound)
- return NO;
-
- // update state of menu items
- [[[_playlistHeaderView menu] itemWithTag: i_tag] setState: i_state];
- [[[[[VLCMain sharedInstance] mainMenu] playlistTableColumnsMenu] itemWithTag: i_tag] setState: i_state];
-
- // Change outline view
- if (i_state == NSOnState) {
- NSString *title = [_translationsForPlaylistTableColumns objectForKey:columnId];
- if (!title)
- return NO;
-
- NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:columnId];
- [tableColumn setEditable:NO];
- [[tableColumn dataCell] setFont:[NSFont controlContentFontOfSize:11.]];
-
- [[tableColumn headerCell] setStringValue:[_translationsForPlaylistTableColumns objectForKey:columnId]];
-
- if ([columnId isEqualToString: TRACKNUM_COLUMN]) {
- [tableColumn setMinWidth:20.];
- [tableColumn setMaxWidth:70.];
- [[tableColumn headerCell] setStringValue:@"#"];
-
- } else {
- [tableColumn setMinWidth:42.];
- }
-
- [_outlineView addTableColumn:tableColumn];
- [_outlineView reloadData];
- [_outlineView setNeedsDisplay: YES];
- }
- else
- [_outlineView removeTableColumn: [_outlineView tableColumnWithIdentifier:columnId]];
-
- [_outlineView setOutlineTableColumn: [_outlineView tableColumnWithIdentifier:TITLE_COLUMN]];
-
- return YES;
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)item
-{
- if ([item action] == @selector(revealItemInFinder:)) {
- NSIndexSet *selectedRows = [_outlineView selectedRowIndexes];
- if (selectedRows.count != 1)
- return NO;
-
- VLCPLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
-
- // Check if item exists in file system
- char *psz_url = input_item_GetURI([o_item input]);
- NSURL *url = [NSURL URLWithString:toNSStr(psz_url)];
- free(psz_url);
- if (![url isFileURL])
- return NO;
- if (![[NSFileManager defaultManager] fileExistsAtPath:[url path]])
- return NO;
-
- } else if ([item action] == @selector(deleteItem:)) {
- return [_outlineView numberOfSelectedRows] > 0 && _model.editAllowed;
- } else if ([item action] == @selector(selectAll:)) {
- return [_outlineView numberOfRows] > 0;
- } else if ([item action] == @selector(playItem:)) {
- return [_outlineView numberOfSelectedRows] > 0;
- } else if ([item action] == @selector(recursiveExpandOrCollapseNode:)) {
- return [_outlineView numberOfSelectedRows] > 0;
- } else if ([item action] == @selector(showInfoPanel:)) {
- return [_outlineView numberOfSelectedRows] > 0;
- }
-
- return YES;
-}
-
-#pragma mark -
-#pragma mark Helper for playlist table columns
-
-- (void)setupPlaylistTableColumnsForMenu:(NSMenu *)menu
-{
- NSMenuItem *menuItem;
- NSUInteger count = [_menuOrderOfPlaylistTableColumns count];
- for (NSUInteger i = 0; i < count; i++) {
- NSString *columnId = [_menuOrderOfPlaylistTableColumns objectAtIndex:i];
- NSString *title = [_translationsForPlaylistTableColumns objectForKey:columnId];
- menuItem = [menu addItemWithTitle:title
- action:@selector(togglePlaylistColumnTable:)
- keyEquivalent:@""];
- [menuItem setTarget:self];
- [menuItem setTag:i];
-
- /* don't set a valid action for the title column selector, since we want it to be disabled */
- if ([columnId isEqualToString: TITLE_COLUMN])
- [menuItem setAction:nil];
-
- }
-}
-
-- (void)saveTableColumns
-{
- NSMutableArray *arrayToSave = [[NSMutableArray alloc] init];
- NSArray *columns = [[NSArray alloc] initWithArray:[_outlineView tableColumns]];
- NSUInteger columnCount = [columns count];
- NSTableColumn *currentColumn;
- for (NSUInteger i = 0; i < columnCount; i++) {
- currentColumn = [columns objectAtIndex:i];
- [arrayToSave addObject:[NSArray arrayWithObjects:[currentColumn identifier], [NSNumber numberWithFloat:[currentColumn width]], nil]];
- }
- [[NSUserDefaults standardUserDefaults] setObject:arrayToSave forKey:@"PlaylistColumnSelection"];
- [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-#pragma mark -
-#pragma mark Item helpers
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
- NSArray *items = [self createItemsFromExternalPasteboard:[sender draggingPasteboard]];
-
- if (items.count == 0)
- return NO;
-
- [self addPlaylistItems:items tryAsSubtitle:YES];
- return YES;
-}
-
-- (input_item_t *)createItem:(NSDictionary *)itemToCreateDict
-{
- intf_thread_t *p_intf = getIntf();
-
- input_item_t *p_input;
- BOOL b_rem = FALSE, b_dir = FALSE, b_writable = FALSE;
- NSString *uri, *name, *path;
- NSURL * url;
- NSArray *optionsArray;
-
- /* Get the item */
- uri = (NSString *)[itemToCreateDict objectForKey: @"ITEM_URL"];
- url = [NSURL URLWithString: uri];
- path = [url path];
- name = (NSString *)[itemToCreateDict objectForKey: @"ITEM_NAME"];
- optionsArray = (NSArray *)[itemToCreateDict objectForKey: @"ITEM_OPTIONS"];
-
- if ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&b_dir] && b_dir &&
- [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath:path isRemovable: &b_rem
- isWritable:&b_writable isUnmountable:NULL description:NULL type:NULL] && b_rem && !b_writable && [url isFileURL]) {
-
- NSString *diskType = getVolumeTypeFromMountPath(path);
- msg_Dbg(p_intf, "detected optical media of type %s in the file input", [diskType UTF8String]);
-
- if ([diskType isEqualToString: kVLCMediaDVD])
- uri = [NSString stringWithFormat: @"dvdnav://%@", getBSDNodeFromMountPath(path)];
- else if ([diskType isEqualToString: kVLCMediaVideoTSFolder])
- uri = [NSString stringWithFormat: @"dvdnav://%@", path];
- else if ([diskType isEqualToString: kVLCMediaAudioCD])
- uri = [NSString stringWithFormat: @"cdda://%@", getBSDNodeFromMountPath(path)];
- else if ([diskType isEqualToString: kVLCMediaVCD])
- uri = [NSString stringWithFormat: @"vcd://%@#0:0", getBSDNodeFromMountPath(path)];
- else if ([diskType isEqualToString: kVLCMediaSVCD])
- uri = [NSString stringWithFormat: @"vcd://%@@0:0", getBSDNodeFromMountPath(path)];
- else if ([diskType isEqualToString: kVLCMediaBD] || [diskType isEqualToString: kVLCMediaBDMVFolder])
- uri = [NSString stringWithFormat: @"bluray://%@", path];
- else
- msg_Warn(getIntf(), "unknown disk type, treating %s as regular input", [path UTF8String]);
-
- p_input = input_item_New([uri UTF8String], [[[NSFileManager defaultManager] displayNameAtPath:path] UTF8String]);
- }
- else
- p_input = input_item_New([uri fileSystemRepresentation], name ? [name UTF8String] : NULL);
-
- if (!p_input)
- return NULL;
-
- if (optionsArray) {
- NSUInteger count = [optionsArray count];
- for (NSUInteger i = 0; i < count; i++)
- input_item_AddOption(p_input, [[optionsArray objectAtIndex:i] UTF8String], VLC_INPUT_OPTION_TRUSTED);
- }
-
- /* Recent documents menu */
- if (url != nil && var_InheritBool(getIntf(), "macosx-recentitems"))
- [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:url];
-
- return p_input;
-}
-
-- (NSArray *)createItemsFromExternalPasteboard:(NSPasteboard *)pasteboard
-{
- NSArray *o_array = [NSArray array];
- if (![[pasteboard types] containsObject: NSFilenamesPboardType])
- return o_array;
-
- NSArray *o_values = [[pasteboard propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
- NSUInteger count = [o_values count];
-
- for (NSUInteger i = 0; i < count; i++) {
- NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
- if (!psz_uri)
- continue;
-
- o_dic = [NSDictionary dictionaryWithObject:toNSStr(psz_uri) forKey:@"ITEM_URL"];
- free(psz_uri);
-
- o_array = [o_array arrayByAddingObject: o_dic];
- }
-
- return o_array;
-}
-
-- (void)addPlaylistItems:(NSArray*)array
-{
-
- int i_plItemId = -1;
-
- BOOL b_autoplay = var_InheritBool(getIntf(), "macosx-autoplay");
-
- [self addPlaylistItems:array withParentItemId:i_plItemId atPos:-1 startPlayback:b_autoplay];
-}
-
-- (void)addPlaylistItems:(NSArray*)array tryAsSubtitle:(BOOL)isSubtitle
-{
- input_thread_t *p_input = pl_CurrentInput(getIntf());
- if (isSubtitle && array.count == 1 && p_input) {
- int i_result = input_AddSlave(p_input, SLAVE_TYPE_SPU,
- [[[array firstObject] objectForKey:@"ITEM_URL"] UTF8String],
- true, true, true);
- if (i_result == VLC_SUCCESS) {
- vlc_object_release(p_input);
- return;
- }
- }
-
- if (p_input)
- vlc_object_release(p_input);
-
- [self addPlaylistItems:array];
-}
-
-- (void)addPlaylistItems:(NSArray*)array withParentItemId:(int)i_plItemId atPos:(int)i_position startPlayback:(BOOL)b_start
-{
- playlist_t * p_playlist = pl_Get(getIntf());
- PL_LOCK;
-
- playlist_item_t *p_parent = NULL;
- if (i_plItemId >= 0)
- p_parent = playlist_ItemGetById(p_playlist, i_plItemId);
- else
- p_parent = p_playlist->p_playing;
-
- if (!p_parent) {
- PL_UNLOCK;
- return;
- }
-
- NSUInteger count = [array count];
- int i_current_offset = 0;
- for (NSUInteger i = 0; i < count; ++i) {
-
- NSDictionary *o_current_item = [array objectAtIndex:i];
- input_item_t *p_input = [self createItem: o_current_item];
- if (!p_input)
- continue;
-
- int i_pos = (i_position == -1) ? PLAYLIST_END : i_position + i_current_offset++;
- playlist_item_t *p_item = playlist_NodeAddInput(p_playlist, p_input,
- p_parent, i_pos);
- if (!p_item)
- continue;
-
- if (i == 0 && b_start) {
- playlist_ViewPlay(p_playlist, p_parent, p_item);
- }
- input_item_Release(p_input);
- }
- PL_UNLOCK;
- [[[[VLCMain sharedInstance] mainWindow] sidebarView] performSelector:@selector(reloadData) withObject:nil afterDelay:0.15];
-}
-
-- (IBAction)recursiveExpandOrCollapseNode:(id)sender
-{
- bool expand = (sender == _recursiveExpandPlaylistMenuItem);
-
- NSIndexSet * selectedRows = [_outlineView selectedRowIndexes];
- NSUInteger count = [selectedRows count];
- NSUInteger indexes[count];
- [selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
-
- id item;
- for (NSUInteger i = 0; i < count; i++) {
- item = [_outlineView itemAtRow: indexes[i]];
-
- /* We need to collapse the node first, since OSX refuses to recursively
- expand an already expanded node, even if children nodes are collapsed. */
- if ([_outlineView isExpandable:item]) {
- [_outlineView collapseItem: item collapseChildren: YES];
-
- if (expand)
- [_outlineView expandItem: item expandChildren: YES];
- }
-
- selectedRows = [_outlineView selectedRowIndexes];
- [selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
- }
-}
-
-- (NSMenu *)menuForEvent:(NSEvent *)o_event
-{
- if (!b_playlistmenu_nib_loaded)
- b_playlistmenu_nib_loaded = [[NSBundle mainBundle] loadNibNamed:@"PlaylistMenu" owner:self topLevelObjects:nil];
-
- NSPoint pt = [_outlineView convertPoint: [o_event locationInWindow] fromView: nil];
- NSInteger row = [_outlineView rowAtPoint:pt];
- if (row != -1 && ![[_outlineView selectedRowIndexes] containsIndex: row])
- [_outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-
- // TODO Reenable once per-item info panel is supported again
- _infoPlaylistMenuItem.hidden = YES;
-
- return _playlistMenu;
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView didClickTableColumn:(NSTableColumn *)aTableColumn
-{
- int type = 0;
- NSString * identifier = [aTableColumn identifier];
-
- if (_sortTableColumn == aTableColumn)
- b_isSortDescending = !b_isSortDescending;
- else
- b_isSortDescending = false;
-
- if (b_isSortDescending)
- type = ORDER_REVERSE;
- else
- type = ORDER_NORMAL;
-
- [[self model] sortForColumn:identifier withMode:type];
-
- /* Clear indications of any existing column sorting */
- NSUInteger count = [[_outlineView tableColumns] count];
- for (NSUInteger i = 0 ; i < count ; i++)
- [_outlineView setIndicatorImage:nil inTableColumn: [[_outlineView tableColumns] objectAtIndex:i]];
-
- [_outlineView setHighlightedTableColumn:nil];
- _sortTableColumn = aTableColumn;
- [_outlineView setHighlightedTableColumn:aTableColumn];
-
- if (b_isSortDescending)
- [_outlineView setIndicatorImage:_descendingSortingImage inTableColumn:aTableColumn];
- else
- [_outlineView setIndicatorImage:_ascendingSortingImage inTableColumn:aTableColumn];
-}
-
-
-- (void)outlineView:(NSOutlineView *)outlineView
- willDisplayCell:(id)cell
- forTableColumn:(NSTableColumn *)tableColumn
- item:(id)item
-{
- /* this method can be called when VLC is already dead, hence the extra checks */
- intf_thread_t * p_intf = getIntf();
- if (!p_intf)
- return;
- playlist_t *p_playlist = pl_Get(p_intf);
-
- NSFont *fontToUse;
- if (var_InheritBool(getIntf(), "macosx-large-text"))
- fontToUse = [NSFont systemFontOfSize:13.];
- else
- fontToUse = [NSFont systemFontOfSize:11.];
-
- BOOL b_is_playing = NO;
- PL_LOCK;
- playlist_item_t *p_current_item = playlist_CurrentPlayingItem(p_playlist);
- if (p_current_item) {
- b_is_playing = p_current_item->i_id == [item plItemId];
- }
- PL_UNLOCK;
-
- if (b_is_playing)
- [cell setFont: [[NSFontManager sharedFontManager] convertFont:fontToUse toHaveTrait:NSBoldFontMask]];
- else
- [cell setFont: [[NSFontManager sharedFontManager] convertFont:fontToUse toNotHaveTrait:NSBoldFontMask]];
-}
-
-// TODO remove method
-- (NSArray *)draggedItems
-{
- return [[self model] draggedItems];
-}
-
-@end
diff --git a/modules/gui/macosx/VLCPlaylistInfo.m b/modules/gui/macosx/VLCPlaylistInfo.m
index 937338f1ed654c4a34898b0a8b2d549c0fc9ce21..e9c2cf2bf9bed2c39aa566623684cfdcf81fd687 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -24,7 +24,6 @@
#import "CompatibilityFixes.h"
#import "VLCMain.h"
#import "VLCPlaylistInfo.h"
-#import "VLCPlaylist.h"
#import <vlc_url.h>
@interface VLCInfo () <NSOutlineViewDataSource>
diff --git a/modules/gui/macosx/VLCPlaylistView.h b/modules/gui/macosx/VLCPlaylistView.h
deleted file mode 100644
index 639b9d48b17da19ea960c29d83fd12b4a13c33f6..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPlaylistView.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistView.h: OutlineView subclass for the playlist
- *****************************************************************************
- * Copyright (C) 2002-2015 VLC authors and VideoLAN
- *
- * Authors: Derk-Jan Hartman <hartman at videolan dot org>
- * Felix Paul Kühne <fkuehne at videolan dot org>
- *
- * 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.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCPlaylistView : NSOutlineView
-
-@end
diff --git a/modules/gui/macosx/VLCPlaylistView.m b/modules/gui/macosx/VLCPlaylistView.m
deleted file mode 100644
index 4c57a4a5e465e0d0492f94ac854f10b75145046b..0000000000000000000000000000000000000000
--- a/modules/gui/macosx/VLCPlaylistView.m
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * VLCPlaylistView.m: OutlineView subclass for the playlist
- *****************************************************************************
-* Copyright (C) 2003-2015 VLC authors and VideoLAN
- *
- * Authors: Derk-Jan Hartman <hartman at videola/n dot org>
- * Benjamin Pracht <bigben at videolab dot org>
- * Felix Paul Kühne <fkuehne at videolan dot org>
- *
- * 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.
- *****************************************************************************/
-
-#import "VLCMain.h"
-#import "VLCPlaylistView.h"
-#import "VLCPlaylist.h"
-
-@implementation VLCPlaylistView
-
-- (NSMenu *)menuForEvent:(NSEvent *)event
-{
- return([(VLCPlaylist *)[self delegate] menuForEvent: event]);
-}
-
-- (void)keyDown:(NSEvent *)event
-{
- unichar key = 0;
-
- if ([[event characters] length])
- key = [[event characters] characterAtIndex: 0];
-
- switch(key) {
- case NSDeleteCharacter:
- case NSDeleteFunctionKey:
- case NSDeleteCharFunctionKey:
- case NSBackspaceCharacter:
- [(VLCPlaylist *)[self delegate] deleteItem:self];
- break;
-
- case NSEnterCharacter:
- case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:nil];
- break;
-
- default:
- [super keyDown: event];
- break;
- }
-}
-
-- (BOOL)acceptsFirstResponder
-{
- return YES;
-}
-
-- (BOOL)becomeFirstResponder
-{
- [self setNeedsDisplay:YES];
- return YES;
-}
-
-- (BOOL)resignFirstResponder
-{
- [self setNeedsDisplay:YES];
- return YES;
-}
-
-@end
diff --git a/modules/gui/macosx/VLCVideoOutputProvider.m b/modules/gui/macosx/VLCVideoOutputProvider.m
index c1748f40ab1cf552de86edc145df6573d53de621..eb463f6ba2294eee2bebf14c8ae82f4f5111a44f 100644
--- a/modules/gui/macosx/VLCVideoOutputProvider.m
+++ b/modules/gui/macosx/VLCVideoOutputProvider.m
@@ -36,7 +36,6 @@
#import "VLCBookmarksWindowController.h"
#import "VLCTrackSynchronizationWindowController.h"
#import "VLCResumeDialogController.h"
-#import "VLCPlaylist.h"
#import "NSScreen+VLCAdditions.h"
static int WindowEnable(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
diff --git a/modules/gui/macosx/VLCVoutView.m b/modules/gui/macosx/VLCVoutView.m
index d5e31012d765cab1119d895ffe361d1494fb18f5..5cea84c6073b99736ef30c3a2cc425f463fb8193 100644
--- a/modules/gui/macosx/VLCVoutView.m
+++ b/modules/gui/macosx/VLCVoutView.m
@@ -34,7 +34,6 @@
#import "VLCMain.h"
#import "VLCCoreInteraction.h"
#import "VLCVoutView.h"
-#import "VLCPlaylist.h"
#import "VLCMainMenu.h"
#import <QuartzCore/QuartzCore.h>
@@ -131,7 +130,8 @@
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
- BOOL b_returned = [[[VLCMain sharedInstance] playlist] performDragOperation:sender];
+ // FIXME: re-implement drag and drop of new input items to the playlist
+ BOOL b_returned = NO;
[self setNeedsDisplay:YES];
return b_returned;
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index 8e5c916f3883c2583e41dcbda3549ab3ddbbabda..02a6d09fecd2b6c611efdbaafd1683474899e274 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -25,7 +25,6 @@
#import "misc.h"
#import "VLCMainWindow.h"
#import "VLCMain.h"
-#import "VLCPlaylist.h"
#import "VLCMainMenu.h"
#import "VLCControlsBarCommon.h"
#import "VLCCoreInteraction.h"
@@ -119,12 +118,13 @@
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
- BOOL b_returned;
+ BOOL b_returned = NO;
if (_dropHandler && [_dropHandler respondsToSelector:@selector(performDragOperation:)])
b_returned = [_dropHandler performDragOperation:sender];
- else // default
- b_returned = [[[VLCMain sharedInstance] playlist] performDragOperation:sender];
+ // default
+ // FIXME: implement drag and drop _on_ new playlist
+// b_returned = [[[VLCMain sharedInstance] playlist] performDragOperation:sender];
[self setNeedsDisplay:YES];
return b_returned;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6c8400492199c9cc56895748b7584c7e8776864..d1fd2c6c038a8ea0db8259719c671b8a8d1b186c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -509,18 +509,10 @@ modules/gui/macosx/VLCOpenWindowController.h
modules/gui/macosx/VLCOpenWindowController.m
modules/gui/macosx/VLCOutput.h
modules/gui/macosx/VLCOutput.m
-modules/gui/macosx/VLCPLItem.h
-modules/gui/macosx/VLCPLItem.m
-modules/gui/macosx/VLCPLModel.h
-modules/gui/macosx/VLCPLModel.m
-modules/gui/macosx/VLCPlaylist.h
-modules/gui/macosx/VLCPlaylist.m
modules/gui/macosx/VLCPlaylistInfo.h
modules/gui/macosx/VLCPlaylistInfo.m
modules/gui/macosx/VLCPlaylistMenuController.h
modules/gui/macosx/VLCPlaylistMenuController.m
-modules/gui/macosx/VLCPlaylistView.h
-modules/gui/macosx/VLCPlaylistView.m
modules/gui/macosx/VLCPopupPanelController.h
modules/gui/macosx/VLCPopupPanelController.m
modules/gui/macosx/VLCRendererDiscovery.h