macosx: don't import the legacy playlist globally

Import it where needed only to identify those areas

modules/gui/macosx/coreinteraction/VLCCoreInteraction.m

@@ -28,6 +28,8 @@
 #import <vlc_plugin.h>
 #import <vlc_actions.h>
 
+#import <vlc_playlist_legacy.h>
+
 #import "main/VLCMain.h"
 #import "coreinteraction/VLCClickerManager.h"
 #import "playlist/VLCPlaylistController.h"
@@ -35,6 +37,7 @@
 #import "playlist/VLCPlaylistModel.h"
 #import "windows/VLCOpenWindowController.h"
 
+#import "extensions/helpers.h"
 
 static int BossCallback(vlc_object_t *p_this, const char *psz_var,
                         vlc_value_t oldval, vlc_value_t new_val, void *param)

modules/gui/macosx/coreinteraction/VLCInputManager.m

@@ -21,6 +21,7 @@
 #import "VLCInputManager.h"
 
 #include <vlc_url.h>
+#import <vlc_playlist_legacy.h>
 
 #import "coreinteraction/VLCCoreInteraction.h"
 #import "main/CompatibilityFixes.h"

modules/gui/macosx/coreinteraction/VLCVideoFilterHelper.m

@@ -24,8 +24,10 @@
 
 #import <vlc_modules.h>
 #import <vlc_charset.h>
+#import <vlc_playlist_legacy.h>
 
 #import "main/VLCMain.h"
+#import "extensions/helpers.h"
 
 @implementation VLCVideoFilterHelper
 

modules/gui/macosx/main/VLCMain+OldPrefs.m

@@ -94,18 +94,10 @@ static const int kCurrentPreferencesVersion = 4;
         // In VLC 2.2.x, config for filters was fully controlled by audio and video effects panel.
         // In VLC 3.0, this is no longer the case and VLCs config is not touched anymore. Therefore,
         // disable filter in VLCs config in this transition.
-        playlist_t *p_playlist = pl_Get(getIntf());
-        var_SetString(p_playlist, "audio-filter", "");
-        var_SetString(p_playlist, "video-filter", "");
 
         config_PutPsz("audio-filter", "");
         config_PutPsz("video-filter", "");
         config_SaveConfigFile(getIntf());
-
-        // This migration only has effect rarely, therefore only restart then
-        if (!hasUpdated)
-            return;
-
     } else {
         NSArray *libraries = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
                                                                  NSUserDomainMask, YES);

modules/gui/macosx/main/VLCMain.h

@@ -31,7 +31,6 @@
 
 #import <vlc_common.h>
 #import <vlc_interface.h>
-#import <vlc_playlist_legacy.h>
 #import <vlc_vout.h>
 #import <vlc_aout.h>
 #import <vlc_input.h>
@@ -50,9 +49,6 @@
 
 intf_thread_t *getIntf(void);
 
-// TODO fix include order
-#import "extensions/helpers.h"
-
 static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 static NSString * VLCConfigurationChangedNotification = @"VLCConfigurationChangedNotification";
 static NSString * VLCMediaKeySupportSettingChangedNotification = @"VLCMediaKeySupportSettingChangedNotification";

modules/gui/macosx/main/VLCMain.m

@@ -41,6 +41,7 @@
 #include <vlc_dialog.h>
 #include <vlc_url.h>
 #include <vlc_variables.h>
+#import <vlc_playlist_legacy.h>
 
 #import "coreinteraction/VLCCoreInteraction.h"
 #import "coreinteraction/VLCInputManager.h"
@@ -73,6 +74,7 @@
 #import "windows/VLCOpenInputMetadata.h"
 #import "windows/video/VLCVoutView.h"
 
+#import "extensions/helpers.h"
 
 #ifdef HAVE_SPARKLE
 #import <Sparkle/Sparkle.h>                 /* we're the update delegate */

modules/gui/macosx/menus/VLCMainMenu.m

@@ -58,6 +58,8 @@
 #import "windows/logging/VLCLogWindowController.h"
 #import "windows/addons/VLCAddonsWindowController.h"
 
+#import "extensions/helpers.h"
+
 #ifdef HAVE_SPARKLE
 #import <Sparkle/Sparkle.h>
 #endif

modules/gui/macosx/menus/VLCStatusBarIcon.m

@@ -24,7 +24,6 @@
 #import "VLCStatusBarIcon.h"
 
 #import <vlc_common.h>
-#import <vlc_playlist_legacy.h>
 #import <vlc_input.h>
 #import <vlc_url.h>
 

modules/gui/macosx/panels/VLCAudioEffectsWindowController.m

@@ -29,6 +29,7 @@
 
 #import <vlc_common.h>
 #import <math.h>
+#import <vlc_playlist_legacy.h>
 
 #import "../../../audio_filter/equalizer_presets.h"
 
@@ -38,6 +39,8 @@
 #import "panels/dialogs/VLCPopupPanelController.h"
 #import "panels/dialogs/VLCTextfieldPanelController.h"
 
+#import "extensions/helpers.h"
+
 
 #pragma mark -
 #pragma mark Initialization

modules/gui/macosx/panels/VLCBookmarksWindowController.m

@@ -36,6 +36,7 @@
 #import "VLCBookmarksWindowController.h"
 
 #import "main/CompatibilityFixes.h"
+#import <vlc_playlist_legacy.h>
 
 @interface VLCBookmarksWindowController() <NSTableViewDataSource, NSTableViewDelegate>
 {

modules/gui/macosx/panels/VLCInformationWindowController.m

@@ -377,8 +377,7 @@ FREENULL( psz_##foo );
     input_item_SetDescription( _mediaItem, utf8( _descriptionTextField ) );
     input_item_SetLanguage( _mediaItem, utf8( _languageTextField ) );
 
-    playlist_t *p_playlist = pl_Get(getIntf());
-    input_item_WriteMeta(VLC_OBJECT(p_playlist), _mediaItem);
+    input_item_WriteMeta(VLC_OBJECT(getIntf()), _mediaItem);
 
     [self updatePanelWithItem: _mediaItem];
 

modules/gui/macosx/panels/VLCTrackSynchronizationWindowController.m

@@ -28,6 +28,8 @@
 #import "coreinteraction/VLCVideoFilterHelper.h"
 #import "main/CompatibilityFixes.h"
 #import "main/VLCMain.h"
+#import <vlc_playlist_legacy.h>
+#import "extensions/helpers.h"
 
 #define SUBSDELAY_CFG_MODE                     "subsdelay-mode"
 #define SUBSDELAY_CFG_FACTOR                   "subsdelay-factor"

modules/gui/macosx/panels/VLCVideoEffectsWindowController.m

@@ -30,6 +30,9 @@
 #import "panels/dialogs/VLCPopupPanelController.h"
 #import "panels/dialogs/VLCTextfieldPanelController.h"
 
+#import <vlc_playlist_legacy.h>
+#import "extensions/helpers.h"
+
 #define getWidgetBoolValue(w)   ((vlc_value_t){ .b_bool = [w state] })
 #define getWidgetIntValue(w)    ((vlc_value_t){ .i_int = [w intValue] })
 #define getWidgetFloatValue(w)  ((vlc_value_t){ .f_float = [w floatValue] })

modules/gui/macosx/windows/convertandsave/VLCConvertAndSaveWindowController.m

@@ -29,6 +29,7 @@
 
 #import <vlc_common.h>
 #import <vlc_url.h>
+#import <vlc_playlist_legacy.h>
 
 /* mini doc:
  * the used NSMatrix includes a bunch of cells referenced most easily by tags. There you go: */

modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m

@@ -31,6 +31,8 @@
 #import "playlist/VLCPlaylistController.h"
 #import "playlist/VLCPlayerController.h"
 
+#import <vlc_playlist_legacy.h>
+
 /*****************************************************************************
  * VLCControlsBarCommon
  *

modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m

@@ -31,6 +31,7 @@
 #import "menus/VLCMainMenu.h"
 #import "windows/mainwindow/VLCMainWindowControlsBar.h"
 
+#import <vlc_playlist_legacy.h>
 
 /*****************************************************************************
  * VLCMainWindowControlsBar

modules/gui/macosx/windows/video/VLCFSPanelController.m

@@ -26,6 +26,7 @@
 #import "VLCFSPanelController.h"
 
 #import <vlc_aout.h>
+#import <vlc_playlist_legacy.h>
 
 #import "coreinteraction/VLCCoreInteraction.h"
 #import "main/CompatibilityFixes.h"

modules/gui/macosx/windows/video/VLCVideoOutputProvider.m

@@ -24,6 +24,7 @@
 #import "VLCVideoOutputProvider.h"
 
 #include <vlc_vout_display.h>
+#import <vlc_playlist_legacy.h>
 
 #import "extensions/NSScreen+VLCAdditions.h"
 

modules/gui/macosx/windows/video/VLCVideoWindowCommon.m

@@ -29,6 +29,9 @@
 #import "main/VLCMain.h"
 #import "windows/mainwindow/VLCControlsBarCommon.h"
 #import "windows/mainwindow/VLCMainWindow.h"
+#import "windows/video/VLCVoutView.h"
+#import <vlc_playlist_legacy.h>
+#import "extensions/helpers.h"
 
 /*****************************************************************************
  * VLCVideoWindowCommon

modules/gui/macosx/windows/video/VLCVoutView.m

@@ -43,6 +43,8 @@
 #import "main/VLCMain.h"
 #import "menus/VLCMainMenu.h"
 
+#import <vlc_playlist_legacy.h>
+
 /*****************************************************************************
  * VLCVoutView implementation
  *****************************************************************************/

modules/gui/macosx/windows/video/VLCWindow.m

@@ -26,6 +26,7 @@
 #import "main/CompatibilityFixes.h"
 #import "main/VLCMain.h"
 #import "windows/video/VLCVideoWindowCommon.h"
+#import "windows/video/VLCVoutView.h"
 
 /*****************************************************************************
  * VLCWindow