← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/macosx/VideoView.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/VideoView.m
2
2
 * VideoView.m: MacOS X video output module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2002-2012 VLC authors and VideoLAN
5
 
 * $Id: b191bc7d8ea9232ef0f10ab53308da416fe69f84 $
 
5
 * $Id: 55d52040e5c1b245d2daddd0a62104a8465df0ad $
6
6
 *
7
7
 * Authors: Derk-Jan Hartman <hartman at videolan dot org>
8
8
 *          Eric Petit <titer@m0k.org>
109
109
- (void)closeVout
110
110
{
111
111
    vout_thread_t * p_vout = getVout();
112
 
    if( !p_vout )
 
112
    if( p_vout )
113
113
    {
114
114
        var_DelCallback( p_vout, "video-device", DeviceCallback, NULL );
115
115
        vlc_object_release( p_vout );
166
166
                val.i_int |= (int)CocoaKeyToVLC( key );
167
167
                var_Set( p_vout->p_libvlc, "key-pressed", val );
168
168
            }
169
 
            vlc_object_release( p_vout );
170
169
        }
171
170
        else
172
171
            msg_Dbg( VLCIntf, "could not send keyevent to VLC core" );
 
172
 
 
173
        if (p_vout)
 
174
            vlc_object_release( p_vout );
173
175
    }
174
176
    else
175
177
        [super keyDown: o_event];