[vlc-commits] macosx: remove preparse and "cover art download" from pl context menu

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Feb  4 16:29:37 2017 +0100| [06959ed088b366aef72a7f692bb9ec282636e066] | committer: David Fuhrmann

macosx: remove preparse and "cover art download" from pl context menu

Both should not need to be triggered by the user. Instead, that
should happen automatically.

refs #17726

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06959ed088b366aef72a7f692bb9ec282636e066
---

 modules/gui/macosx/UI/PlaylistMenu.xib | 12 -------
 modules/gui/macosx/VLCPlaylist.h       |  4 ---
 modules/gui/macosx/VLCPlaylist.m       | 57 ----------------------------------
 3 files changed, 73 deletions(-)

diff --git a/modules/gui/macosx/UI/PlaylistMenu.xib b/modules/gui/macosx/UI/PlaylistMenu.xib
index 22744f1..ccbbd6d 100644
--- a/modules/gui/macosx/UI/PlaylistMenu.xib
+++ b/modules/gui/macosx/UI/PlaylistMenu.xib
@@ -10,11 +10,9 @@
             <connections>
                 <outlet property="addFilesToPlaylistMenuItem" destination="lGc-nc-8Yq" id="joN-zx-w8u"/>
                 <outlet property="deletePlaylistMenuItem" destination="13" id="Qwn-a7-On0"/>
-                <outlet property="downloadCoverArtPlaylistMenuItem" destination="2" id="z0y-0U-uRz"/>
                 <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="preparsePlaylistMenuItem" destination="4" id="KRL-o9-2sq"/>
                 <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"/>
@@ -58,16 +56,6 @@
                         <action selector="showInfoPanel:" target="-2" id="36"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Preparse" id="4">
-                    <connections>
-                        <action selector="preparseItem:" target="-2" id="33"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Download Cover Art" id="2">
-                    <connections>
-                        <action selector="downloadCoverArt:" target="-2" id="34"/>
-                    </connections>
-                </menuItem>
                 <menuItem title="Reveal in Finder" id="3">
                     <connections>
                         <action selector="revealItemInFinder:" target="-2" id="4WU-rm-69M"/>
diff --git a/modules/gui/macosx/VLCPlaylist.h b/modules/gui/macosx/VLCPlaylist.h
index d37fa6e..cb80656 100644
--- a/modules/gui/macosx/VLCPlaylist.h
+++ b/modules/gui/macosx/VLCPlaylist.h
@@ -33,9 +33,7 @@
 @property (readwrite, weak) IBOutlet NSMenuItem *playPlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *deletePlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *infoPlaylistMenuItem;
- at property (readwrite, weak) IBOutlet NSMenuItem *preparsePlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *revealInFinderPlaylistMenuItem;
- at property (readwrite, weak) IBOutlet NSMenuItem *downloadCoverArtPlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *selectAllPlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *recursiveExpandPlaylistMenuItem;
 @property (readwrite, weak) IBOutlet NSMenuItem *addFilesToPlaylistMenuItem;
@@ -58,8 +56,6 @@
 
 - (IBAction)playItem:(id)sender;
 - (IBAction)revealItemInFinder:(id)sender;
-- (IBAction)preparseItem:(id)sender;
-- (IBAction)downloadCoverArt:(id)sender;
 - (IBAction)deleteItem:(id)sender;
 - (IBAction)selectAll:(id)sender;
 - (IBAction)recursiveExpandNode:(id)sender;
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index fcc777d..dced430 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -232,8 +232,6 @@
     [_recursiveExpandPlaylistMenuItem setTitle: _NS("Expand Node")];
     [_selectAllPlaylistMenuItem setTitle: _NS("Select All")];
     [_infoPlaylistMenuItem setTitle: _NS("Media Information...")];
-    [_downloadCoverArtPlaylistMenuItem setTitle: _NS("Download Cover Art")];
-    [_preparsePlaylistMenuItem setTitle: _NS("Fetch Meta Data")];
     [_revealInFinderPlaylistMenuItem setTitle: _NS("Reveal in Finder")];
     [_addFilesToPlaylistMenuItem setTitle: _NS("Add File...")];
 }
@@ -331,59 +329,6 @@
     [[NSWorkspace sharedWorkspace] selectFile: path inFileViewerRootedAtPath: path];
 }
 
-/* When called retrieves the selected outlineview row and plays that node or item */
-- (IBAction)preparseItem:(id)sender
-{
-    int i_count;
-    NSIndexSet *o_selected_indexes;
-    intf_thread_t * p_intf = getIntf();
-    playlist_t * p_playlist = pl_Get(p_intf);
-    playlist_item_t *p_item = NULL;
-
-    o_selected_indexes = [_outlineView selectedRowIndexes];
-    i_count = [o_selected_indexes count];
-
-    NSUInteger indexes[i_count];
-    [o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
-    for (int i = 0; i < i_count; i++) {
-        VLCPLItem *o_item = [_outlineView itemAtRow:indexes[i]];
-        [_outlineView deselectRow: indexes[i]];
-
-        if (![o_item isLeaf]) {
-            msg_Dbg(p_intf, "preparsing nodes not implemented");
-            continue;
-        }
-
-        libvlc_MetadataRequest(p_intf->obj.libvlc, [o_item input], META_REQUEST_OPTION_NONE, -1, NULL);
-
-    }
-    [self playlistUpdated];
-}
-
-- (IBAction)downloadCoverArt:(id)sender
-{
-    int i_count;
-    NSIndexSet *o_selected_indexes;
-    intf_thread_t * p_intf = getIntf();
-    playlist_t * p_playlist = pl_Get(p_intf);
-    playlist_item_t *p_item = NULL;
-
-    o_selected_indexes = [_outlineView selectedRowIndexes];
-    i_count = [o_selected_indexes count];
-
-    NSUInteger indexes[i_count];
-    [o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
-    for (int i = 0; i < i_count; i++) {
-        VLCPLItem *o_item = [_outlineView itemAtRow: indexes[i]];
-
-        if (![o_item isLeaf])
-            continue;
-
-        libvlc_ArtRequest(p_intf->obj.libvlc, [o_item input], META_REQUEST_OPTION_NONE);
-    }
-    [self playlistUpdated];
-}
-
 - (IBAction)selectAll:(id)sender
 {
     [_outlineView selectAll: nil];
@@ -736,9 +681,7 @@
 
     // TODO move other items to menu validation protocol
     [_infoPlaylistMenuItem setEnabled: b_item_sel];
-    [_preparsePlaylistMenuItem setEnabled: b_item_sel];
     [_recursiveExpandPlaylistMenuItem setEnabled: b_item_sel];
-    [_downloadCoverArtPlaylistMenuItem setEnabled: b_item_sel];
 
     return _playlistMenu;
 }