Skip to content

V
vlc
Commit eff2b91b authored by David Fuhrmann's avatar David Fuhrmann Committed by Jean-Baptiste Kempf
Browse files
Options

macosx: fix auto play when adding a new file with file dialogs 

The issue was that we had 2 VLCPlaylist objects although they should be only one. Therefore this commit removes the wrong one in Open.xib
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit aba13572)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 11b3731e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 39 deletions
extras/package/macosx/Resources/English.lproj/Open.xib
View file @ eff2b91b
...@@ -38,9 +38,6 @@ ...@@ -38,9 +38,6 @@
<object class="NSCustomObject" id="436853527"> <object class="NSCustomObject" id="436853527">
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSCustomObject" id="752055462">
<string key="NSClassName">VLCPlaylist</string>
</object>
<object class="NSCustomObject" id="609169471"> <object class="NSCustomObject" id="609169471">
<string key="NSClassName">VLCOpen</string> <string key="NSClassName">VLCOpen</string>
</object> </object>
...@@ -5177,14 +5174,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> ...@@ -5177,14 +5174,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords"> <object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_playlist</string>
<reference key="source" ref="609169471"/>
<reference key="destination" ref="752055462"/>
</object>
<int key="connectionID">410</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">panelCancel:</string> <string key="label">panelCancel:</string>
...@@ -7661,12 +7650,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> ...@@ -7661,12 +7650,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
<string key="objectName">Application</string> <string key="objectName">Application</string>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">269</int>
<reference key="object" ref="752055462"/>
<reference key="parent" ref="0"/>
<string key="objectName">VLCPlaylist</string>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">408</int> <int key="objectID">408</int>
<reference key="object" ref="609169471"/> <reference key="object" ref="609169471"/>
...@@ -12785,22 +12768,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> ...@@ -12785,22 +12768,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
<string key="minorKey"/> <string key="minorKey"/>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylist</string>
<string key="superclassName">VLCPlaylistCommon</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylistCommon</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
</object> </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
......
modules/gui/macosx/open.h
View file @ eff2b91b
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
*****************************************************************************/ *****************************************************************************/
@interface VLCOpen : NSObject @interface VLCOpen : NSObject
{ {
IBOutlet id o_playlist;
IBOutlet id o_panel; IBOutlet id o_panel;
IBOutlet id o_mrl_fld; IBOutlet id o_mrl_fld;
......
modules/gui/macosx/open.m
View file @ eff2b91b
...@@ -448,9 +448,9 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -448,9 +448,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
/* apply the options to our item(s) */ /* apply the options to our item(s) */
[o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"]; [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
if( b_autoplay ) if( b_autoplay )
[o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO]; [[[VLCMain sharedInstance] playlist] appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
else else
[o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:YES]; [[[VLCMain sharedInstance] playlist] appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:YES];
} }
} }
...@@ -1148,9 +1148,9 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -1148,9 +1148,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_array addObject: o_dic]; [o_array addObject: o_dic];
} }
if( b_autoplay ) if( b_autoplay )
[o_playlist appendArray: o_array atPos: -1 enqueue:NO]; [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:NO];
else else
[o_playlist appendArray: o_array atPos: -1 enqueue:YES]; [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:YES];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment