From d6d2450d6d80eca70981feff20cd98baf5c0a45f Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sun, 16 May 2004 20:27:47 +0000 Subject: [PATCH] * modules/gui/macosx/output.m: added mp4a. * modules/gui/macosx/controls.m: fix the autogenerated menu. --- modules/gui/macosx/controls.m | 17 ++++++++--------- modules/gui/macosx/output.m | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 7c0c56cb08..def26bf34e 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -444,7 +444,7 @@ return; } - if( val.psz_string ) free( val.psz_string ); + if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string ); if( text.psz_string ) free( text.psz_string ); } @@ -559,7 +559,7 @@ } /* clean up everything */ - if( val.psz_string ) free( val.psz_string ); + if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string ); var_Change( p_object, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list ); } @@ -705,17 +705,16 @@ NSEnumerator *o_enumerator = [o_windows objectEnumerator]; bEnabled = FALSE; - if ( [[o_mi title] isEqualToString: _NS("Float on Top")] ) - { - int i_state = config_GetInt( p_playlist, "video-on-top" ) ? - NSOnState : NSOffState; - [o_mi setState: i_state]; - } - vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); if( p_vout != NULL ) { + if ( [[o_mi title] isEqualToString: _NS("Float on Top")] ) + { + var_Get( p_vout, "video-on-top", &val ); + [o_mi setState: val.b_bool ? NSOnState : NSOffState]; + } + while ((o_window = [o_enumerator nextObject])) { if( [[o_window className] isEqualToString: @"VLCWindow"] ) diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m index 5fc33067a9..0aa917ef1e 100644 --- a/modules/gui/macosx/output.m +++ b/modules/gui/macosx/output.m @@ -113,13 +113,13 @@ - (void)initStrings { NSArray *o_muxers = [NSArray arrayWithObjects: @"MPEG TS", @"MPEG PS", @"MPEG 1", - @"Ogg", @"AVI", @"ASF", @"MPEG 4", @"Quicktime", nil]; + @"Ogg", @"AVI", @"ASF", @"MPEG 4", @"Quicktime", @"Raw", nil]; NSArray *o_a_channels = [NSArray arrayWithObjects: @"1", @"2", @"4", @"6", nil]; NSArray *o_a_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96", @"128", @"192", @"256", @"512", nil]; NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96", @"128", @"192", @"256", @"384", @"512", @"768", @"1024", @"2048", @"3072", nil]; - NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"a52 ", @"vorb", @"flac", @"spx ", nil]; + NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil]; NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1", @"DIV2", @"DIV3", @"H263", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil]; @@ -128,7 +128,7 @@ [o_btn_ok setTitle: _NS("OK")]; [o_options_lbl setTitle: _NS("Output Options")]; - [o_display setTitle: _NS("Screen")]; + [o_display setTitle: _NS("Play locally")]; [[o_method cellAtRow:0 column:0] setTitle: _NS("File")]; [[o_method cellAtRow:1 column:0] setTitle: _NS("Stream")]; [o_dump_chkbox setTitle: _NS("Dump raw input")]; @@ -225,6 +225,7 @@ [[o_mux_selector itemAtIndex: 5] setEnabled: YES]; // ASF [[o_mux_selector itemAtIndex: 6] setEnabled: YES]; // MPEG 4 [[o_mux_selector itemAtIndex: 7] setEnabled: YES]; // QuickTime + [[o_mux_selector itemAtIndex: 8] setEnabled: YES]; // Raw } else if( [o_mode isEqualToString: _NS("Stream")] ) { @@ -247,9 +248,10 @@ [[o_mux_selector itemAtIndex: 2] setEnabled: YES]; [[o_mux_selector itemAtIndex: 3] setEnabled: YES]; [[o_mux_selector itemAtIndex: 4] setEnabled: NO]; - [[o_mux_selector itemAtIndex: 5] setEnabled: NO]; + [[o_mux_selector itemAtIndex: 5] setEnabled: YES]; [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; + [[o_mux_selector itemAtIndex: 8] setEnabled: YES]; } else if( [o_mode isEqualToString: @"MMSH"] ) { @@ -264,6 +266,7 @@ [[o_mux_selector itemAtIndex: 5] setEnabled: YES]; [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; + [[o_mux_selector itemAtIndex: 8] setEnabled: NO]; } else if( [o_mode isEqualToString: @"UDP"] ) { @@ -277,6 +280,7 @@ [[o_mux_selector itemAtIndex: 5] setEnabled: NO]; [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; + [[o_mux_selector itemAtIndex: 8] setEnabled: YES]; [o_sap_chkbox setEnabled: YES]; [o_slp_chkbox setEnabled: YES]; [o_channel_name setEnabled: YES]; @@ -293,6 +297,7 @@ [[o_mux_selector itemAtIndex: 5] setEnabled: NO]; [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; + [[o_mux_selector itemAtIndex: 8] setEnabled: YES]; } } if( ![[o_mux_selector selectedItem] isEnabled] ) @@ -323,6 +328,7 @@ else if ( [o_mux isEqualToString: @"MPEG 1"] ) o_mux_string = @"mpeg1"; else if ( [o_mux isEqualToString: @"Quicktime"] ) o_mux_string = @"mov"; else if ( [o_mux isEqualToString: @"ASF"] ) o_mux_string = @"asf"; + else if ( [o_mux isEqualToString: @"Raw"] ) o_mux_string = @"raw"; else o_mux_string = @"ts"; if( [o_mode isEqualToString: _NS("File")] ) @@ -413,6 +419,8 @@ o_mux_string = @"mp4"; else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"Quicktime"] ) o_mux_string = @"mov"; + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"Raw"] ) + o_mux_string = @"raw"; else o_mux_string = @"ts"; -- 2.39.2