/*****************************************************************************
- * lirc.c : lirc plugin for vlc
+ * lirc.c : lirc module for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: lirc.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: lirc.c,v 1.11 2004/02/15 19:40:41 sigmunau Exp $
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Author: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/vout.h>
+#include <vlc/aout.h>
+#include <osd.h>
#include <lirc/lirc_client.h>
vlc_mutex_t change_lock;
input_thread_t * p_input;
+ vout_thread_t * p_vout;
};
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("infrared remote control module") );
+ set_description( _("Infrared remote control interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
{
vlc_object_release( p_intf->p_sys->p_input );
}
-
+ if( p_intf->p_sys->p_vout )
+ {
+ vlc_object_release( p_intf->p_sys->p_vout );
+ }
/* Destroy structure */
lirc_freeconfig( p_intf->p_sys->config );
lirc_deinit();
char *code, *c;
playlist_t *p_playlist;
input_thread_t *p_input;
+ vout_thread_t *p_vout = NULL;
while( !p_intf->b_die )
{
vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL;
}
+ p_input = p_intf->p_sys->p_input;
+
+ /* Update the vout */
+ if( p_vout == NULL )
+ {
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ p_intf->p_sys->p_vout = p_vout;
+ }
+ else if( p_vout->b_die )
+ {
+ vlc_object_release( p_vout );
+ p_vout = NULL;
+ p_intf->p_sys->p_vout = NULL;
+ }
/* We poll the lircsocket */
if( lirc_nextcode(&code) != 0 )
continue;
}
- while( !p_intf->b_die
+ while( !p_intf->b_die
&& lirc_code2char( p_intf->p_sys->config, code, &c ) == 0
&& c != NULL )
{
+
if( !strcmp( c, "QUIT" ) )
{
p_intf->p_vlc->b_die = VLC_TRUE;
+ vout_OSDMessage( p_intf, _("Quit" ) );
continue;
}
-
- if( !strcmp( c, "FULLSCREEN" ) )
+ else if( !strcmp( c, "VOL_UP" ) )
{
- vout_thread_t *p_vout;
- p_vout = vlc_object_find( p_intf->p_sys->p_input,
- VLC_OBJECT_VOUT, FIND_CHILD );
- if( p_vout )
+ audio_volume_t i_newvol;
+ aout_VolumeUp( p_intf, 1, &i_newvol );
+ vout_OSDMessage( p_intf, _("Vol %%%d"), i_newvol*100/AOUT_VOLUME_MAX );
+ }
+ else if( !strcmp( c, "VOL_DOWN" ) )
+ {
+ audio_volume_t i_newvol;
+ aout_VolumeDown( p_intf, 1, &i_newvol );
+ vout_OSDMessage( p_intf, _("Vol %%%d"), i_newvol*100/AOUT_VOLUME_MAX );
+ }
+ else if( !strcmp( c, "MUTE" ) )
+ {
+ audio_volume_t i_newvol = -1;
+ aout_VolumeMute( p_intf, &i_newvol );
+ if( i_newvol == 0 )
+ {
+ vout_OSDMessage( p_intf, _( "Mute" ) );
+ }
+ else
+ {
+ vout_OSDMessage( p_intf, _("Vol %d%%"), i_newvol*100/AOUT_VOLUME_MAX );
+ }
+ }
+ if( p_vout )
+ {
+ if( !strcmp( c, "FULLSCREEN" ) )
{
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- vlc_object_release( p_vout );
+ continue;
+ }
+ if( !strcmp( c, "ACTIVATE" ) )
+ {
+ vlc_value_t val;
+ val.psz_string = "ENTER";
+ if (var_Set( p_vout, "key-pressed", val ) != VLC_SUCCESS)
+ {
+ msg_Warn( p_intf, "key-press failed" );
+ }
+ continue;
+ }
+
+ if( !strcmp( c, "LEFT" ) )
+ {
+ vlc_value_t val;
+ val.psz_string = "LEFT";
+ if (var_Set( p_vout, "key-pressed", val ) != VLC_SUCCESS)
+ {
+ msg_Warn( p_intf, "key-press failed" );
+ }
+ continue;
+ }
+
+ if( !strcmp( c, "RIGHT" ) )
+ {
+ vlc_value_t val;
+ val.psz_string = "RIGHT";
+ if (var_Set( p_vout, "key-pressed", val ) != VLC_SUCCESS)
+ {
+ msg_Warn( p_intf, "key-press failed" );
+ }
+ continue;
+ }
+
+ if( !strcmp( c, "UP" ) )
+ {
+ vlc_value_t val;
+ val.psz_string = "UP";
+ if (var_Set( p_vout, "key-pressed", val ) != VLC_SUCCESS)
+ {
+ msg_Warn( p_intf, "key-press failed" );
+ }
+ continue;
+ }
+
+ if( !strcmp( c, "DOWN" ) )
+ {
+ vlc_value_t val;
+ val.psz_string = "DOWN";
+ if (var_Set( p_vout, "key-pressed", val ) != VLC_SUCCESS)
+ {
+ msg_Warn( p_intf, "key-press failed" );
+ }
+ continue;
}
- continue;
}
if( !strcmp( c, "PLAY" ) )
vlc_object_release( p_playlist );
}
}
+ continue;
}
- else if( p_intf->p_sys->p_input )
+
+ if( !strcmp( c, "PLAYPAUSE" ) )
{
- p_input = p_intf->p_sys->p_input;
+ vlc_value_t val;
+ val.i_int = PLAYING_S;
+ if( p_input )
+ {
+ var_Get( p_input, "state", &val );
+ }
+ if( p_input && val.i_int != PAUSE_S )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Pause" ) );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
+ }
+ else
+ {
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->i_size )
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vout_OSDMessage( p_intf, _( "Play" ) );
+ playlist_Play( p_playlist );
+ vlc_object_release( p_playlist );
+ }
+ }
+ }
+ continue;
+ }
- if( !strcmp( c, "PAUSE" ) )
+ else if( p_input )
+ {
+ if( !strcmp( c, "AUDIO_TRACK" ) )
+ {
+ vlc_value_t val,list,list2;
+ int i_count, i;
+ var_Get( p_input, "audio-es", &val );
+ var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES, &list, &list2 );
+ i_count = list.p_list->i_count;
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ break;
+ }
+ }
+ /* value of audio-es was not in choices list */
+ if( i == i_count )
+ {
+ msg_Warn( p_input, "invalid current audio track, selecting 0" );
+ var_Set( p_input, "audio-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else if( i == i_count - 1 )
+ {
+ var_Set( p_input, "audio-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else
+ {
+ var_Set( p_input, "audio-es", list.p_list->p_values[i+1] );
+ i = i + 1;
+ }
+ vout_OSDMessage( VLC_OBJECT(p_input), _("Audio track: %s"), list2.p_list->p_values[i].psz_string );
+ }
+ else if( !strcmp( c, "SUBTITLE_TRACK" ) )
+ {
+ vlc_value_t val,list,list2;
+ int i_count, i;
+ var_Get( p_input, "spu-es", &val );
+ var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES, &list, &list2 );
+ i_count = list.p_list->i_count;
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ break;
+ }
+ }
+ /* value of audio-es was not in choices list */
+ if( i == i_count )
+ {
+ msg_Warn( p_input, "invalid current subtitle track, selecting 0" );
+ var_Set( p_input, "spu-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else if( i == i_count - 1 )
+ {
+ var_Set( p_input, "spu-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else
+ {
+ var_Set( p_input, "spu-es", list.p_list->p_values[i+1] );
+ i = i + 1;
+ }
+ vout_OSDMessage( VLC_OBJECT(p_input), _("Subtitle track: %s"), list2.p_list->p_values[i].psz_string );
+ }
+ else if( !strcmp( c, "PAUSE" ) )
{
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+ vlc_value_t val;
+ vout_OSDMessage( p_intf, _( "Pause" ) );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
}
else if( !strcmp( c, "NEXT" ) )
{
}
else if( !strcmp( c, "FAST" ) )
{
- input_SetStatus( p_input, INPUT_STATUS_FASTER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-faster", val );
}
else if( !strcmp( c, "SLOW" ) )
{
- input_SetStatus( p_input, INPUT_STATUS_SLOWER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-slower", val );
}
+/* beginning of modifications by stephane Thu Jun 19 15:29:49 CEST 2003 */
+ else if ( !strcmp(c, "CHAPTER_N" ) ||
+ !strcmp( c, "CHAPTER_P" ) )
+ {
+ unsigned int i_chapter = 0;
+
+ if( !strcmp( c, "CHAPTER_N" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_chapter = p_input->stream.p_selected_area->i_part + 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+ else if( !strcmp( c, "CHAPTER_P" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_chapter = p_input->stream.p_selected_area->i_part - 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( ( i_chapter > 0 ) && ( i_chapter <
+ p_input->stream.p_selected_area->i_part_nb ) )
+ {
+ input_area_t *p_area = p_input->stream.p_selected_area;
+ p_input->stream.p_selected_area->i_part = i_chapter;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_ChangeArea( p_input, p_area );
+ input_SetStatus( p_input, INPUT_STATUS_PLAY );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+/* end of modification by stephane Thu Jun 19 15:29:49 CEST 2003 */
}
}
free( code );
}
}
-
projects / vlc / blobdiff