[vlc-commits] macosx: respect 'playlist-autostart' (close #7272)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Jul 15 12:35:42 2013 +0200| [8af35880cb9cefd6b0b3e9f20104f551c838ce64] | committer: Felix Paul Kühne

macosx: respect 'playlist-autostart' (close #7272)

(cherry picked from commit dd212bfe22089604415aefa69b33cd8f354cd847)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8af35880cb9cefd6b0b3e9f20104f551c838ce64
---

 NEWS                      |    3 ++-
 modules/gui/macosx/intf.m |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d9f27ff..9d70011 100644
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,9 @@ Access:
 Demux:
  * Fix use after free in sgimb
 
-MacOSX:
+Mac OS X:
  * Fix interface crashes
+ * Fix autostart playback option
 
 Translations:
  * update Welsh translation
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index a5bdff6..654c554 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -691,6 +691,13 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mainwindow updateWindow];
     [o_mainwindow updateTimeSlider];
     [o_mainwindow updateVolumeSlider];
+
+    playlist_t * p_playlist = pl_Get(VLCIntf);
+    PL_LOCK;
+    BOOL kidsAround = p_playlist->p_local_category->i_children;
+    PL_UNLOCK;
+    if (kidsAround && var_GetBool(p_playlist, "playlist-autostart"))
+        [[self playlist] playItem:nil];
 }
 
 - (void)initStrings