macosx: added an option to disable the 'Recent Items' list as requested by multiple...

diff --git a/NEWS b/NEWS
index b520607dbd261e5daa1296ff3852e49b19ae4ceb..c645a2031e03950dd7c193d999117a53d8c24c10 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -121,6 +121,7 @@ Audio output and filters
  * Replay gain support
  * Audio playback when going slower/faster (no pitch filter yet)
  * New spatializer audio filter
+ * Correct DTS output via S/PDIF
 
 Stream output:
  * RTSP for TS-multiplexed broadcast streams
@@ -145,6 +146,7 @@ Interfaces:
  * Mac OS X
    * Improved video output features
    * Access to VideoLAN's Help Wiki within VLC
+   * New setting to disable the "Recent Items" service
  * Unix
    * Option to allow only one running instance, using D-Bus interface.
    * D-Bus Interface implementing the MPRIS 

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index cbad67275f8ea3331428f6d27d25bdc7b4ad31ea..dc41ee1e638b731f81f6af64539e118287b2eea1 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -48,31 +48,29 @@ void E_(CloseVideoGL) ( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 #define EMBEDDED_TEXT N_("Embedded video output")
-#define EMBEDDED_LONGTEXT N_( \
-   "Display the video in the controller window instead of a in separate window.")
+#define EMBEDDED_LONGTEXT N_( "Display the video in the controller window instead of a in separate window.")
 
 #define VDEV_TEXT N_("Video device")
 #define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
-    "videos in 'fullscreen'. The screen number correspondance can be found in "\
-    "the video device selection menu.")
+                         "videos in 'fullscreen'. The screen number correspondance can be found in "\
+                         "the video device selection menu.")
 
 #define OPAQUENESS_TEXT N_("Opaqueness")
-#define OPAQUENESS_LONGTEXT N_( \
-    "Set the transparency of the video output. 1 is non-transparent (default) " \
-    "0 is fully transparent.")
- 
+#define OPAQUENESS_LONGTEXT N_( "Set the transparency of the video output. 1 is non-transparent (default) " \
+                                "0 is fully transparent.")
+
 #define STRETCH_TEXT N_("Stretch video to fill window")
 #define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
-        "resizing the video instead of keeping the aspect ratio and "\
-        "displaying black borders.")
+                            "resizing the video instead of keeping the aspect ratio and "\
+                            "displaying black borders.")
 
 #define BLACK_TEXT N_("Black screens in fullscreen")
 #define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
-        "video displayed black" )
+                          "video displayed black" )
 
 #define BACKGROUND_TEXT N_("Use as Desktop Background")
 #define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
-        "Desktop icons cannot be interacted with in this mode." )
+                               "Desktop icons cannot be interacted with in this mode." )
 
 #define FSPANEL_TEXT N_("Show Fullscreen controller")
 #define FSPANEL_LONGTEXT N_("Shows a lucent controller when moving the mouse " \
@@ -80,7 +78,11 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 
 #define AUTOPLAY_OSX_TEST N_("Auto-playback of new items")
 #define AUTOPLAY_OSX_LONGTEXT N_("Start playback of new items immediately " \
-        "once they were added." )
+                                 "once they were added." )
+
+#define RECENT_ITEMS_TEXT N_("Keep Recent Items")
+#define RECENT_ITEMS_LONGTEXT N_("By default, VLC keeps a list of the last 10 items. " \
+                                 "This feature can be disabled here.")
 
 vlc_module_begin();
     set_description( _("Mac OS X interface") );
@@ -89,11 +91,13 @@ vlc_module_begin();
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
-                     VLC_FALSE );
+              VLC_FALSE );
     add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
-                     VLC_FALSE );
+              VLC_FALSE );
+    add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
+              VLC_FALSE );
     add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
-                     VLC_FALSE );
+              VLC_FALSE );
 
     add_submodule();
         set_description( _("Quartz video") );
@@ -105,13 +109,13 @@ vlc_module_begin();
         add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
                      VLC_FALSE );
         add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
-                     VLC_FALSE );
+                  VLC_FALSE );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
-                OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
+                              OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
         add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT,
                   VLC_FALSE );
         add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
-                     VLC_FALSE );
+                  VLC_FALSE );
     add_submodule();
         set_description( "Mac OS X OpenGL" );
         set_capability( "opengl provider", 100 );

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 87833aa828ba9330fa23bb1c32104e13e607c560..03ca52763dd8df2244fa796d263b7c7c5502f21b 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -994,7 +994,7 @@
 
     /* Recent documents menu */
     o_true_file = [NSURL fileURLWithPath: o_uri];
-    if( o_true_file != nil )
+    if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
     {
         [[NSDocumentController sharedDocumentController]
             noteNewRecentDocumentURL: o_true_file];