Commit 5b630376 authored by bigben's avatar bigben

* demuxdump is working again

parent 8525ef0a
......@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>793 27 505 517 0 0 1280 1002 </string>
<string>614 71 505 517 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
<string>693 686 104 149 0 0 1280 1002 </string>
<string>542 480 104 149 0 0 1024 746 </string>
<key>29</key>
<string>521 894 419 44 0 0 1280 1002 </string>
<string>366 655 419 44 0 0 1024 746 </string>
<key>915</key>
<string>54 452 185 199 0 0 1024 746 </string>
</dict>
......@@ -21,11 +21,8 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>1617</integer>
<integer>21</integer>
<integer>1647</integer>
<integer>29</integer>
<integer>2029</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>7H63</string>
......
......@@ -232,8 +232,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
{
NSMutableDictionary *o_dic;
NSMutableArray *o_options = [NSMutableArray array];
unsigned int i;
o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
if( [o_file_sub_ckbox state] == NSOnState )
{
[o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
......@@ -245,7 +246,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
}
if( [o_output_ckbox state] == NSOnState )
{
[o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
for (i = 0 ; i < [[o_sout_options getMRL] count] ; i++)
{
[o_options addObject: [NSString stringWithString:
[[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
}
}
[o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
[o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
......
......@@ -80,12 +80,12 @@
IBOutlet id o_http_chkbox;
IBOutlet id o_file_chkbox;
NSString *o_mrl;
NSArray *o_mrl;
NSString *o_transcode;
}
- (void)setMRL:(NSString *)o_mrl_string;
- (NSString *)getMRL;
- (void)setMRL:(NSArray *)o_mrl_string;
- (NSArray *)getMRL;
- (void)setTranscode:(NSString *)o_transcode_string;
- (void)initStrings;
......
......@@ -41,7 +41,7 @@
- (id)init
{
self = [super init];
o_mrl = [[NSString alloc] init];
o_mrl = [[NSArray alloc] init];
o_transcode = [[NSString alloc] init];
return self;
}
......@@ -53,13 +53,13 @@
[super dealloc];
}
- (void)setMRL:(NSString *)o_mrl_string
- (void)setMRL:(NSArray *)o_mrl_array
{
[o_mrl autorelease];
o_mrl = [o_mrl_string copy];
o_mrl = [o_mrl_array copy];
}
- (NSString *)getMRL
- (NSArray *)getMRL
{
return [o_mrl copy];
}
......@@ -349,6 +349,7 @@
NSString *o_mode, *o_mux, *o_mux_string;
NSMutableString *o_announce = [NSMutableString stringWithString:@""];
NSMutableString *o_mrl_string = [NSMutableString stringWithString:@":sout=#"];
NSArray *o_sout_options;
[o_mrl_string appendString: o_transcode];
if( [o_display state] == NSOnState )
......@@ -373,10 +374,15 @@
{
if( [o_dump_chkbox state] == NSOnState )
{
o_mrl_string = [NSMutableString stringWithFormat:
@":demux=demuxdump :demuxdump-file=\"%@\"",
[o_file_field stringValue]];
[self setMRL:o_mrl_string];
NSMutableArray * o_sout_options;
o_sout_options = [NSArray arrayWithObjects:
[NSString stringWithString:
@":demux=dump"],
[NSString stringWithFormat:
@":demuxdump-file=%@",
[o_file_field stringValue]],
nil];
[self setMRL:o_sout_options];
return;
}
else
......@@ -466,7 +472,8 @@
{
[o_mrl_string appendString: @"}"];
}
[self setMRL:o_mrl_string];
o_sout_options = [NSArray arrayWithObjects: o_mrl_string,nil];
[self setMRL:o_sout_options];
}
- (void)TTLChanged:(NSNotification *)o_notification
......
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