/*****************************************************************************
* showintf.c: control the display of the interface in fullscreen mode
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id:$
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
*
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_interface.h>
+#include <vlc_vout.h>
+#include <vlc_playlist.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
*****************************************************************************/
struct intf_sys_t
{
- vlc_object_t * p_vout;
- vlc_bool_t b_button_pressed;
- vlc_bool_t b_triggered;
- int i_threshold;
+ vlc_mutex_t lock;
+ vlc_object_t *p_vout;
+ bool b_button_pressed;
+ bool b_triggered;
+ int i_threshold;
};
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-int E_(Open) ( vlc_object_t * );
-void E_(Close)( vlc_object_t * );
+int Open ( vlc_object_t * );
+void Close( vlc_object_t * );
static void RunIntf( intf_thread_t *p_intf );
-static int InitThread( intf_thread_t *p_intf );
static int MouseEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
* Module descriptor
*****************************************************************************/
#define THRESHOLD_TEXT N_( "Threshold" )
-#define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface" )
+#define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface." )
-vlc_module_begin();
- set_shortname( "Showintf" );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
- set_description( _("Interface showing control interface") );
+vlc_module_begin ()
+ set_shortname( "Showintf" )
+ add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
+ set_description( N_("Show interface with mouse") )
- set_capability( "interface", 0 );
- set_callbacks( E_(Open), E_(Close) );
-vlc_module_end();
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Open: initialize interface
*****************************************************************************/
-int E_(Open)( vlc_object_t *p_this )
+int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/* Allocate instance and initialize some members */
- p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
- if( p_intf->p_sys == NULL )
- {
- return( 1 );
- };
+ intf_sys_t *p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
+
+ vlc_mutex_init( &p_sys->lock );
+ p_sys->p_vout = NULL;
+ p_sys->b_button_pressed = false;
+ p_sys->b_triggered = false;
+ p_sys->i_threshold = config_GetInt( p_intf, "showintf-threshold" );
p_intf->pf_run = RunIntf;
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
* Close: destroy interface
*****************************************************************************/
-void E_(Close)( vlc_object_t *p_this )
+void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/* Destroy structure */
+ vlc_mutex_destroy( &p_intf->p_sys->lock );
free( p_intf->p_sys );
}
*****************************************************************************/
static void RunIntf( intf_thread_t *p_intf )
{
- p_intf->p_sys->p_vout = NULL;
-
- if( InitThread( p_intf ) < 0 )
- {
- msg_Err( p_intf, "cannot initialize intf" );
- return;
- }
+ int canc = vlc_savecancel( );
/* Main loop */
- while( !p_intf->b_die )
+ while( vlc_object_alive( p_intf ) )
{
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
/* Notify the interfaces */
if( p_intf->p_sys->b_triggered )
{
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist != NULL )
- {
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-show", val );
- vlc_object_release( p_playlist );
- }
- p_intf->p_sys->b_triggered = VLC_FALSE;
+ var_SetBool( p_intf->p_libvlc, "intf-show", true );
+ p_intf->p_sys->b_triggered = false;
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
/* Take care of the video output */
- if( p_intf->p_sys->p_vout && p_intf->p_sys->p_vout->b_die )
+ if( p_intf->p_sys->p_vout && !vlc_object_alive (p_intf->p_sys->p_vout) )
{
var_DelCallback( p_intf->p_sys->p_vout, "mouse-moved",
MouseEvent, p_intf );
MouseEvent, p_intf );
vlc_object_release( p_intf->p_sys->p_vout );
}
-}
-
-/*****************************************************************************
- * InitThread:
- *****************************************************************************/
-static int InitThread( intf_thread_t * p_intf )
-{
- if( !p_intf->b_die )
- {
- vlc_mutex_lock( &p_intf->change_lock );
-
- p_intf->p_sys->b_triggered = VLC_FALSE;
- p_intf->p_sys->b_button_pressed = VLC_FALSE;
- p_intf->p_sys->i_threshold =
- config_GetInt( p_intf, "showintf-threshold" );
-
- vlc_mutex_unlock( &p_intf->change_lock );
-
- return 0;
- }
- else
- {
- return -1;
- }
+ vlc_restorecancel( canc );
}
/*****************************************************************************
static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vlc_value_t val;
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(newval);
int i_mouse_x, i_mouse_y;
intf_thread_t *p_intf = (intf_thread_t *)p_data;
return VLC_SUCCESS;
/* Nothing to do when not in fullscreen mode */
- var_Get( p_intf->p_sys->p_vout, "fullscreen", &val );
- if( !val.i_int )
+ if( !var_GetBool( p_intf->p_sys->p_vout, "fullscreen" ) )
return VLC_SUCCESS;
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
if( !strcmp( psz_var, "mouse-moved" ) && !p_intf->p_sys->b_button_pressed )
{
- var_Get( p_intf->p_sys->p_vout, "mouse-x", &val );
- i_mouse_x = val.i_int;
- var_Get( p_intf->p_sys->p_vout, "mouse-y", &val );
- i_mouse_y = val.i_int;
+ i_mouse_x = var_GetInteger( p_intf->p_sys->p_vout, "mouse-x" );
+ i_mouse_y = var_GetInteger( p_intf->p_sys->p_vout, "mouse-y" );
/* Very basic test, we even ignore the x value :) */
if ( i_mouse_y < p_intf->p_sys->i_threshold )
{
msg_Dbg( p_intf, "interface showing requested" );
- p_intf->p_sys->b_triggered = VLC_TRUE;
+ p_intf->p_sys->b_triggered = true;
}
}
if( !p_intf->p_sys->b_button_pressed &&
!strcmp( psz_var, "mouse-button-down" ) )
{
- p_intf->p_sys->b_button_pressed = VLC_TRUE;
+ p_intf->p_sys->b_button_pressed = true;
}
if( p_intf->p_sys->b_button_pressed &&
!strcmp( psz_var, "mouse-button-down" ) )
{
- p_intf->p_sys->b_button_pressed = VLC_FALSE;
+ p_intf->p_sys->b_button_pressed = false;
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}