git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modules/gui/macosx/controls.m:
[vlc.git]
/
modules
/
gui
/
macosx
/
open.m
diff --git
a/modules/gui/macosx/open.m
b/modules/gui/macosx/open.m
index
4d52030
..
0ffbe66
100644
(file)
--- a/
modules/gui/macosx/open.m
+++ b/
modules/gui/macosx/open.m
@@
-2,7
+2,7
@@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.2
8 2003/04/09 14:12:49
hartman Exp $
+ * $Id: open.m,v 1.2
9 2003/04/15 14:05:13
hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
@@
-269,7
+269,6
@@
NSArray *GetEjectableMediaOfClass( const char *psz_class )
int i_result;
[o_tabview selectTabViewItemAtIndex: i_type];
int i_result;
[o_tabview selectTabViewItemAtIndex: i_type];
- [o_ckbox_enqueue setState: NSOnState];
[o_file_sub_ckbox setState: NSOffState];
i_result = [NSApp runModalForWindow: o_panel];
[o_file_sub_ckbox setState: NSOffState];
i_result = [NSApp runModalForWindow: o_panel];
@@
-284,6
+283,10
@@
NSArray *GetEjectableMediaOfClass( const char *psz_class )
{
config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
}
{
config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
}
+ else
+ {
+ config_PutPsz( p_intf, "sout", "" );
+ }
NSString *o_source = [o_mrl stringValue];
BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
NSString *o_source = [o_mrl stringValue];
BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
@@
-813,6
+816,10
@@
NSArray *GetEjectableMediaOfClass( const char *psz_class )
sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
[o_playlist appendArray: o_values atPos: -1 enqueue:NO];
sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
[o_playlist appendArray: o_values atPos: -1 enqueue:NO];
+ config_PutPsz( p_intf, "sub-file", "" );
+ config_PutInt( p_intf, "sub-delay", 0 );
+ config_PutFloat( p_intf, "sub-fps", 0.0 );
+ config_PutPsz( p_intf, "sout", "" );
}
}
}
}