Skip to content

V
vlc-1.1
Commit 2f47743d authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

gesture: remove one dummy function and clean a bit.

parent e42739b4
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 28 deletions
modules/control/gestures.c
View file @ 2f47743d
/***************************************************************************** /*****************************************************************************
* gestures.c: control vlc with mouse gestures * gestures.c: control vlc with mouse gestures
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org> * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
...@@ -116,13 +116,11 @@ int Open ( vlc_object_t *p_this ) ...@@ -116,13 +116,11 @@ int Open ( vlc_object_t *p_this )
/* Allocate instance and initialize some members */ /* Allocate instance and initialize some members */
p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL ) if( p_intf->p_sys == NULL )
{ return VLC_ENOMEM;
return( 1 );
};
p_intf->pf_run = RunIntf; p_intf->pf_run = RunIntf;
return( 0 ); return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
...@@ -133,15 +131,6 @@ static int gesture( int i_pattern, int i_num ) ...@@ -133,15 +131,6 @@ static int gesture( int i_pattern, int i_num )
return ( i_pattern >> ( i_num * 4 ) ) & 0xF; return ( i_pattern >> ( i_num * 4 ) ) & 0xF;
} }
/*****************************************************************************
* input_from_playlist: don't forget to release the return value
* Also this function should really be available from core.
*****************************************************************************/
static input_thread_t * input_from_playlist ( playlist_t *p_playlist )
{
return playlist_CurrentInput( p_playlist );
}
/***************************************************************************** /*****************************************************************************
* CloseIntf: destroy dummy interface * CloseIntf: destroy dummy interface
*****************************************************************************/ *****************************************************************************/
...@@ -220,9 +209,8 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -220,9 +209,8 @@ static void RunIntf( intf_thread_t *p_intf )
{ {
input_thread_t * p_input; input_thread_t * p_input;
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
p_input = input_from_playlist( p_playlist ); pl_Release( p_intf );
vlc_object_release( p_playlist );
if( !p_input ) if( !p_input )
break; break;
...@@ -247,15 +235,13 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -247,15 +235,13 @@ static void RunIntf( intf_thread_t *p_intf )
break; break;
case GESTURE(LEFT,DOWN,NONE,NONE): case GESTURE(LEFT,DOWN,NONE,NONE):
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
playlist_Prev( p_playlist ); playlist_Prev( p_playlist );
vlc_object_release( p_playlist ); pl_Release( p_intf );
break; break;
case GESTURE(RIGHT,DOWN,NONE,NONE): case GESTURE(RIGHT,DOWN,NONE,NONE):
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
playlist_Next( p_playlist ); playlist_Next( p_playlist );
vlc_object_release( p_playlist ); pl_Release( p_intf );
break; break;
case UP: case UP:
{ {
...@@ -286,10 +272,8 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -286,10 +272,8 @@ static void RunIntf( intf_thread_t *p_intf )
int i_count, i; int i_count, i;
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
p_input = input_from_playlist( p_playlist ); pl_Release( p_intf );
vlc_object_release( p_playlist );
if( !p_input ) if( !p_input )
break; break;
...@@ -341,9 +325,8 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -341,9 +325,8 @@ static void RunIntf( intf_thread_t *p_intf )
int i_count, i; int i_count, i;
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
p_input = input_from_playlist( p_playlist ); pl_Release( p_intf );
vlc_object_release( p_playlist );
if( !p_input ) if( !p_input )
break; break;
......
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