macosx: implemented 'play-and-exit' (closes #2237)

Should be backported.

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
index 23536c793767caab8d2b14e80056270ff8948840..c07a401f5c448a83334ce824eca50f6816e26b08 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
@@ -8,11 +8,11 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="2457"/>
                        <integer value="4375"/>
-                       <integer value="2199"/>
+                       <integer value="235"/>
                        <integer value="3568"/>
                        <integer value="283"/>
+                       <integer value="2199"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -842,6 +842,16 @@
                                                                        <reference key="NSOnImage" ref="464614658"/>
                                                                        <reference key="NSMixedImage" ref="724706907"/>
                                                                </object>
+                                                               <object class="NSMenuItem" id="963561211">
+                                                                       <reference key="NSMenu" ref="816567345"/>
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="464614658"/>
+                                                                       <reference key="NSMixedImage" ref="724706907"/>
+                                                               </object>
                                                                <object class="NSMenuItem" id="1056015920">
                                                                        <reference key="NSMenu" ref="816567345"/>
                                                                        <string key="NSTitle">Repeat Item</string>
@@ -860,6 +870,24 @@
                                                                        <reference key="NSOnImage" ref="464614658"/>
                                                                        <reference key="NSMixedImage" ref="724706907"/>
                                                                </object>
+                                                               <object class="NSMenuItem" id="634130855">
+                                                                       <reference key="NSMenu" ref="816567345"/>
+                                                                       <string key="NSTitle">Quit after Playback</string>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="464614658"/>
+                                                                       <reference key="NSMixedImage" ref="724706907"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="598785014">
+                                                                       <reference key="NSMenu" ref="816567345"/>
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="464614658"/>
+                                                                       <reference key="NSMixedImage" ref="724706907"/>
+                                                               </object>
                                                                <object class="NSMenuItem" id="521340648">
                                                                        <reference key="NSMenu" ref="816567345"/>
                                                                        <string key="NSTitle">Add Folder to Playlist...</string>
@@ -9146,6 +9174,22 @@ LCAuLi4</string>
                                        </object>
                                        <int key="connectionID">4535</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">quitAfterPlayback:</string>
+                                               <reference key="source" ref="318538144"/>
+                                               <reference key="destination" ref="634130855"/>
+                                       </object>
+                                       <int key="connectionID">4538</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">o_mi_quitAfterPB</string>
+                                               <reference key="source" ref="382099807"/>
+                                               <reference key="destination" ref="634130855"/>
+                                       </object>
+                                       <int key="connectionID">4539</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -9726,6 +9770,9 @@ LCAuLi4</string>
                                                        <reference ref="128133130"/>
                                                        <reference ref="521340648"/>
                                                        <reference ref="508315060"/>
+                                                       <reference ref="598785014"/>
+                                                       <reference ref="634130855"/>
+                                                       <reference ref="963561211"/>
                                                </object>
                                                <reference key="parent" ref="443407942"/>
                                        </object>
@@ -12689,6 +12736,21 @@ LCAuLi4</string>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">Sparkle Updater</string>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4536</int>
+                                               <reference key="object" ref="598785014"/>
+                                               <reference key="parent" ref="816567345"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4537</int>
+                                               <reference key="object" ref="634130855"/>
+                                               <reference key="parent" ref="816567345"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4540</int>
+                                               <reference key="object" ref="963561211"/>
+                                               <reference key="parent" ref="816567345"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -13197,6 +13259,7 @@ LCAuLi4</string>
                                        <string>3292.ImportedFromIB2</string>
                                        <string>333.IBPluginDependency</string>
                                        <string>333.ImportedFromIB2</string>
+                                       <string>334.IBEditorWindowLastContentRect</string>
                                        <string>334.IBPluginDependency</string>
                                        <string>334.ImportedFromIB2</string>
                                        <string>3385.IBPluginDependency</string>
@@ -13560,6 +13623,9 @@ LCAuLi4</string>
                                        <string>446.IBPluginDependency</string>
                                        <string>446.ImportedFromIB2</string>
                                        <string>4533.IBPluginDependency</string>
+                                       <string>4536.IBPluginDependency</string>
+                                       <string>4537.IBPluginDependency</string>
+                                       <string>4540.IBPluginDependency</string>
                                        <string>5.IBPluginDependency</string>
                                        <string>5.ImportedFromIB2</string>
                                        <string>56.IBPluginDependency</string>
@@ -13628,7 +13694,7 @@ LCAuLi4</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
-                                       <string>{{291, 259}, {200, 173}}</string>
+                                       <string>{{564, 509}, {200, 173}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -13944,7 +14010,7 @@ LCAuLi4</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
-                                       <string>{{214, 79}, {255, 353}}</string>
+                                       <string>{{358, 293}, {255, 393}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -14104,13 +14170,14 @@ LCAuLi4</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
-                                       <string>{{343, 682}, {468, 20}}</string>
+                                       <string>{{214, 686}, {468, 20}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
+                                       <string>{{493, 343}, {198, 343}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -14475,6 +14542,9 @@ LCAuLi4</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
@@ -14542,7 +14612,7 @@ LCAuLi4</string>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">4535</int>
+                       <int key="maxID">4540</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -14760,6 +14830,7 @@ LCAuLi4</string>
                                                        <string>next:</string>
                                                        <string>play:</string>
                                                        <string>prev:</string>
+                                                       <string>quitAfterPlayback:</string>
                                                        <string>random:</string>
                                                        <string>repeat:</string>
                                                        <string>repeatButtonAction:</string>
@@ -14802,6 +14873,7 @@ LCAuLi4</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
@@ -15253,6 +15325,7 @@ LCAuLi4</string>
                                                        <string>o_mi_previous</string>
                                                        <string>o_mi_program</string>
                                                        <string>o_mi_quit</string>
+                                                       <string>o_mi_quitAfterPB</string>
                                                        <string>o_mi_random</string>
                                                        <string>o_mi_readme</string>
                                                        <string>o_mi_repeat</string>
@@ -15452,6 +15525,7 @@ LCAuLi4</string>
                                                        <string>NSMenuItem</string>
                                                        <string>NSMenuItem</string>
                                                        <string>NSMenuItem</string>
+                                                       <string>NSMenuItem</string>
                                                        <string>NSButton</string>
                                                        <string>NSWindow</string>
                                                        <string>NSButton</string>

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index 019ad092c9824ec11d0b382d3b0c0816bd457948..5190d2bf5f572c44c3ffdd8d3bd00275c271b8ac 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 9b40fdc6ef5e7e1c625c36677a4da49454cacfdb..64ffa2a85a7f6f740389c27087a7ddefca7d2b08 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -73,6 +73,7 @@
 - (IBAction)repeat:(id)sender;
 - (IBAction)loop:(id)sender;
 - (IBAction)repeatButtonAction:(id)sender;
+- (IBAction)quitAfterPlayback:(id)sender;
 
 /* the three ugly helpers again */
 - (void)repeatOne;

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index f517c1290f5e79a485a2bc93fdb2f6ddc744f2e7..3cf5c8dce5efda1ca5eec115b17b84a2e9917543 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -379,6 +379,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;
@@ -1053,6 +1063,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")])

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index fb0afba44aeedc6f673fa7632a2e234b40533607..a8f33abbde8639bc36552f2781d147673f9defcf 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -212,6 +212,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;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 43604e83f4c8412208d9297572ea4b99f6782d37..1113e9e2b2c90886a14099b1070f9e67b10c2f03 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -661,6 +661,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")];