← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vlc/utopic

« back to all changes in this revision

Viewing changes to modules/gui/macosx/MainMenu.m

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-07-21 17:52:21 UTC
  • mfrom: (1.1.48) (3.5.44 sid)
  • Revision ID: package-import@ubuntu.com-20120721175221-53m5pclzo992kawy
Tags: 2.0.3-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/macosx/MainMenu.m
2
2
 * MainMenu.m: MacOS X interface module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2011 Felix Paul Kühne
5
 
 * $Id: 4f4456a628bc5ddb34a16786d3fc6e2ee77409c1 $
 
5
 * $Id: bc0b93f83ef7ee9095b4520800d94ea9ff437dc8 $
6
6
 *
7
7
 * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
8
8
 *
441
441
 
442
442
            [self setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
443
443
                                     var: "visual" selector: @selector(toggleVar:)];
444
 
            vlc_object_release( (vlc_object_t *)p_aout );
 
444
            vlc_object_release( p_aout );
445
445
        }
446
446
 
447
447
        vout_thread_t * p_vout = input_GetVout( p_input );
448
448
 
449
449
        if( p_vout != NULL )
450
450
        {
451
 
            vlc_object_t * p_dec_obj;
452
 
 
453
451
            [self setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)p_vout
454
452
                                     var: "aspect-ratio" selector: @selector(toggleVar:)];
455
453
 
467
465
             (vlc_object_t *)p_vout var:"postprocess" selector:
468
466
             @selector(toggleVar:)];
469
467
#endif
470
 
            vlc_object_release( (vlc_object_t *)p_vout );
 
468
            vlc_object_release( p_vout );
471
469
 
472
470
            [self refreshVoutDeviceMenu:nil];
473
471
            [self setSubmenusEnabled: YES];
1233
1231
            if( p_vout != NULL )
1234
1232
            {
1235
1233
                if( [o_title isEqualToString: _NS("Float on Top")] )
1236
 
                {
1237
1234
                    [o_mi setState: var_GetBool( p_vout, "video-on-top" )];
1238
 
                }
1239
1235
 
1240
1236
                bEnabled = TRUE;
1241
1237
 
1242
 
                vlc_object_release( (vlc_object_t *)p_vout );
 
1238
                vlc_object_release( p_vout );
1243
1239
            }
1244
1240
        }
1245
1241
        if( [o_title isEqualToString: _NS("Fullscreen")] )
1301
1297
 
1302
1298
- (void)dealloc
1303
1299
{
1304
 
    vlc_object_release( _vlc_object );
 
1300
    if( _vlc_object )
 
1301
        vlc_object_release( _vlc_object );
1305
1302
    if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
1306
1303
        free( value.psz_string );
1307
1304
    free( psz_name );