macosx: backport [47318ef3]

extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -328,6 +328,8 @@
 				<string>NSMenuItem</string>
 				<key>o_mi_quit</key>
 				<string>NSMenuItem</string>
+				<key>o_mi_quitAfterPB</key>
+				<string>NSMenuItem</string>
 				<key>o_mi_random</key>
 				<string>NSMenuItem</string>
 				<key>o_mi_readme</key>
@@ -537,6 +539,8 @@
 				<string>id</string>
 				<key>prev</key>
 				<string>id</string>
+				<key>quitAfterPlayback</key>
+				<string>id</string>
 				<key>random</key>
 				<string>id</string>
 				<key>repeat</key>

extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib

@@ -10,15 +10,15 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
-		<integer>2709</integer>
+		<integer>4470</integer>
 		<integer>2416</integer>
 		<integer>3568</integer>
-		<integer>4470</integer>
+		<integer>235</integer>
 		<integer>21</integer>
+		<integer>2709</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9L27</string>
+	<string>9L30</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>

modules/gui/macosx/controls.h

@@ -71,6 +71,7 @@
 - (IBAction)repeat:(id)sender;
 - (IBAction)loop:(id)sender;
 - (IBAction)repeatButtonAction:(id)sender;
+- (IBAction)quitAfterPlayback:(id)sender;
 
 /* the three ugly helpers again */
 - (void)repeatOne;

modules/gui/macosx/controls.m

@@ -396,6 +396,16 @@
     pl_Release( p_intf );
 }
 
+- (IBAction)quitAfterPlayback:(id)sender
+{
+    vlc_value_t val;
+    playlist_t * p_playlist = pl_Hold( VLCIntf );
+    var_Get( p_playlist, "play-and-exit", &val );
+    val.b_bool = !val.b_bool;
+    var_Set( p_playlist, "play-and-exit", val );
+    pl_Release( VLCIntf );
+}
+
 - (IBAction)forward:(id)sender
 {
     intf_thread_t * p_intf = VLCIntf;
@@ -1059,6 +1069,13 @@
         i_state = val.b_bool ? NSOnState : NSOffState;
         [o_mi setState: i_state];
     }
+    else if( [[o_mi title] isEqualToString: _NS("Quit after Playback")] )
+    {
+        int i_state;
+        var_Get( p_playlist, "play-and-exit", &val );
+        i_state = val.b_bool ? NSOnState : NSOffState;
+        [o_mi setState: i_state];
+    }
     else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
              [[o_mi title] isEqualToString: _NS("Step Backward")] ||
              [[o_mi title] isEqualToString: _NS("Jump To Time")])

modules/gui/macosx/intf.h

@@ -209,6 +209,7 @@ struct intf_sys_t
     IBOutlet NSMenuItem * o_mi_random;
     IBOutlet NSMenuItem * o_mi_repeat;
     IBOutlet NSMenuItem * o_mi_loop;
+    IBOutlet NSMenuItem * o_mi_quitAfterPB;
     IBOutlet NSMenuItem * o_mi_fwd;
     IBOutlet NSMenuItem * o_mi_bwd;
     IBOutlet NSMenuItem * o_mi_fwd1m;

modules/gui/macosx/intf.m

@@ -645,6 +645,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_random setTitle: _NS("Random")];
     [o_mi_repeat setTitle: _NS("Repeat One")];
     [o_mi_loop setTitle: _NS("Repeat All")];
+    [o_mi_quitAfterPB setTitle: _NS("Quit after Playback")];
     [o_mi_fwd setTitle: _NS("Step Forward")];
     [o_mi_bwd setTitle: _NS("Step Backward")];