← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/macosx/controls.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/controls.m
2
2
 * controls.m: MacOS X interface module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2002-2011 VLC authors and VideoLAN
5
 
 * $Id: ba6d9a05e3fb9796a022f34b77ebae685d912736 $
 
5
 * $Id: 871526ae2c23d003469769086c6efa6e8b40349d $
6
6
 *
7
7
 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
8
8
 *          Christophe Massiot <massiot@via.ecp.fr>
163
163
        if( p_vout != NULL )
164
164
        {
165
165
            var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_POSITION );
166
 
            vlc_object_release( (vlc_object_t *)p_vout );
 
166
            vlc_object_release( p_vout );
167
167
        }
168
168
        vlc_object_release( p_input );
169
169
    }
359
359
                /* Escape */
360
360
                if( key == (unichar) 0x1b )
361
361
                {
362
 
                    vout_thread_t *p_vout = getVout();
363
 
                    if (p_vout)
 
362
                    if (var_GetBool( p_vout, "fullscreen" ))
364
363
                    {
365
 
                        if (var_GetBool( p_vout, "fullscreen" ))
366
 
                        {
367
 
                            [[VLCCoreInteraction sharedInstance] toggleFullscreen];
368
 
                            eventHandled = YES;
369
 
                        }
 
364
                        [[VLCCoreInteraction sharedInstance] toggleFullscreen];
 
365
                        eventHandled = YES;
370
366
                    }
371
367
                }
372
368
                else if( key == ' ' )
374
370
                    [self play:self];
375
371
                    eventHandled = YES;
376
372
                }
377
 
                vlc_object_release( (vlc_object_t *)p_vout );
 
373
                vlc_object_release( p_vout );
378
374
            }
379
375
            vlc_object_release( p_input );
380
376
        }