* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * Copyright (C) 1998-2007 the VideoLAN team
+ * $Id$
*
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* 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
*
* 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.
*****************************************************************************/
+/**
+ * \file
+ * This file contains functions related to interface management
+ */
+
+
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* free(), strtol() */
-#include <stdio.h> /* FILE */
-#include <string.h> /* strerror() */
+#include <vlc/vlc.h>
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "plugins.h"
-#include "modules.h"
+#include <vlc_aout.h>
+#include <vlc_vout.h>
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include "vlc_interface.h"
+#include "modules/modules.h" // Gruik!
-#include "audio_output.h"
-
-#include "intf_msg.h"
-#include "interface.h"
-#include "intf_cmd.h"
-#include "intf_console.h"
-#include "intf_plst.h"
-#include "keystrokes.h"
+#ifdef __APPLE__
+# include <Cocoa/Cocoa.h>
+#endif
-#include "video.h"
-#include "video_output.h"
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static void RunInterface( intf_thread_t *p_intf );
-#include "main.h"
+static int SwitchIntfCallback( vlc_object_t *, char const *,
+ vlc_value_t , vlc_value_t , void * );
+static int AddIntfCallback( vlc_object_t *, char const *,
+ vlc_value_t , vlc_value_t , void * );
+#ifdef __APPLE__
+static void Manager( intf_thread_t *p_intf );
/*****************************************************************************
- * intf_channel_t: channel description
- *****************************************************************************
- * A 'channel' is a descriptor of an input method. It is used to switch easily
- * from source to source without having to specify the whole input thread
- * configuration. The channels array, stored in the interface thread object, is
- * loaded in intf_Create, and unloaded in intf_Destroy.
+ * VLCApplication interface
*****************************************************************************/
-typedef struct intf_channel_s
+@interface VLCApplication : NSApplication
{
- /* Channel description */
- int i_channel; /* channel number, -1 for end of array */
- char * psz_description; /* channel description (owned) */
+ libvlc_int_t *o_libvlc;
+}
- /* Input configuration */
- int i_input_method; /* input method descriptor */
- char * psz_input_source; /* source string (owned) */
- int i_input_port; /* port */
- int i_input_vlan_id; /* vlan id */
-} intf_channel_t;
+- (void)setVLC: (libvlc_int_t *)p_libvlc;
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int LoadChannels ( intf_thread_t *p_intf, char *psz_filename );
-static void UnloadChannels ( intf_thread_t *p_intf );
-static int ParseChannel ( intf_channel_t *p_channel, char *psz_str );
+@end
+#endif
/*****************************************************************************
* intf_Create: prepare interface before main loop
* This function opens output devices and creates specific interfaces. It sends
* its own error messages.
*****************************************************************************/
-intf_thread_t* intf_Create( void )
+/**
+ * Create the interface, and prepare it for main loop.
+ * You can give some additional options to be used for interface initialization
+ *
+ * \param p_this the calling vlc_object_t
+ * \param psz_module a preferred interface module
+ * \param i_options number additional options
+ * \param ppsz_options additional option strings
+ * \return a pointer to the created interface thread, NULL on error
+ */
+intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
+ int i_options, const char *const *ppsz_options )
{
intf_thread_t * p_intf;
- typedef void ( intf_getplugin_t ) ( intf_thread_t * p_intf );
- int i_index;
- int i_best_index = 0, i_best_score = 0;
+ int i;
/* Allocate structure */
- p_intf = malloc( sizeof( intf_thread_t ) );
+ p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
if( !p_intf )
{
- intf_ErrMsg( "intf error: cannot create interface thread (%s)",
- strerror( ENOMEM ) );
- return( NULL );
+ msg_Err( p_this, "out of memory" );
+ return NULL;
}
+ p_intf->pf_request_window = NULL;
+ p_intf->pf_release_window = NULL;
+ p_intf->pf_control_window = NULL;
+ p_intf->b_play = VLC_FALSE;
+ p_intf->b_interaction = VLC_FALSE;
- /* Get a suitable interface plugin */
- for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ )
+ for( i = 0 ; i< i_options; i++ )
{
- /* If there's a plugin in p_info ... */
- if( p_main->p_bank->p_info[ i_index ] != NULL )
- {
- /* ... and if this plugin provides the functions we want ... */
- if( p_main->p_bank->p_info[ i_index ]->intf_GetPlugin != NULL )
- {
- /* ... and if this plugin has a good score ... */
- if( p_main->p_bank->p_info[ i_index ]->i_score > i_best_score )
- {
- /* ... then take it */
- i_best_score = p_main->p_bank->p_info[ i_index ]->i_score;
- i_best_index = i_index;
- }
- }
- }
+ var_OptionParse( p_intf, ppsz_options[i] );
}
- if( i_best_score == 0 )
+ /* Choose the best module */
+ p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
+
+ if( p_intf->p_module == NULL )
{
- free( p_intf );
- intf_ErrMsg( "intf error: no suitable plugin" );
- return( NULL );
+ msg_Err( p_intf, "no suitable interface module" );
+ vlc_object_destroy( p_intf );
+ return NULL;
}
- /* Get the plugin functions */
- ( (intf_getplugin_t *)
- p_main->p_bank->p_info[ i_best_index ]->intf_GetPlugin )( p_intf );
-
/* Initialize structure */
- p_intf->b_die = 0;
- p_intf->p_vout = NULL;
- p_intf->p_input = NULL;
- p_intf->p_keys = NULL;
-
- /* Warning level initialisation */
- p_intf->i_warning_level = main_GetIntVariable( INTF_WARNING_VAR, INTF_WARNING_DEFAULT );
-
- /* Load channels - the pointer will be set to NULL on failure. The
- * return value is ignored since the program can work without
- * channels */
- LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR, INTF_CHANNELS_DEFAULT ));
-
- /* Start interfaces */
- p_intf->p_console = intf_ConsoleCreate();
- if( p_intf->p_console == NULL )
- {
- intf_ErrMsg( "intf error: cannot create control console" );
- free( p_intf );
- return( NULL );
- }
+ p_intf->b_menu = VLC_FALSE;
+ p_intf->b_menu_change = VLC_FALSE;
- if( p_intf->p_sys_create( p_intf ) )
- {
- intf_ErrMsg("intf error: cannot create interface");
- intf_ConsoleDestroy( p_intf->p_console );
- free( p_intf );
- return( NULL );
- }
+ /* Initialize mutexes */
+ vlc_mutex_init( p_intf, &p_intf->change_lock );
- intf_Msg("intf: interface initialized");
- return( p_intf );
+ /* Attach interface to its parent object */
+ vlc_object_attach( p_intf, p_this );
+
+ return p_intf;
}
/*****************************************************************************
- * intf_Run
+ * intf_RunThread: launch the interface thread
*****************************************************************************
- * Initialization script and main interface loop.
+ * This function either creates a new thread and runs the interface in it,
+ * or runs the interface in the current thread, depending on b_block.
*****************************************************************************/
-void intf_Run( intf_thread_t *p_intf )
+/**
+ * Run the interface thread.
+ *
+ * If b_block is not set, runs the interface in the thread, else,
+ * creates a new thread and runs the interface.
+ * \param p_intf the interface thread
+ * \return VLC_SUCCESS on success, an error number else
+ */
+int intf_RunThread( intf_thread_t *p_intf )
{
- /* Flush messages before spawning input */
- intf_FlushMsg();
+#ifdef __APPLE__
+ NSAutoreleasePool * o_pool;
- /* Main loop */
- while( !p_intf->b_die )
+ /* If !clivlc, then run as a OS X application */
+ if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name,
+ "clivlc", 6) )
{
- /* Select the next playlist item */
- intf_PlstNext( p_main->p_playlist );
+ o_pool = [[NSAutoreleasePool alloc] init];
+ [VLCApplication sharedApplication];
+ [NSApp setVLC: p_intf->p_libvlc];
- if( p_main->p_playlist->i_index == -1 )
+ if( p_intf->pf_run )
+ RunInterface( p_intf );
+ else
{
- /* FIXME: wait for user to add stuff to playlist ? */
- p_intf->b_die = 1;
- return;
+ [NSApp run];
+ while( !intf_ShouldDie( p_intf ) )
+ msleep( INTF_IDLE_SLEEP * 2);
}
-
- p_intf->p_input =
- input_CreateThread( &p_main->p_playlist->current, NULL );
-
- /* Main loop */
- while( !p_intf->b_die && (p_intf->p_input != NULL) )
+ vlc_object_kill( p_intf );
+ }
+ else
+#endif
+ if( p_intf->b_block )
+ {
+ /* If we are clivlc+macosx, don't run the macosx GUI */
+ if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
{
- /* Flush waiting messages */
- intf_FlushMsg();
-
- /* Manage specific interface */
- p_intf->p_sys_manage( p_intf );
+ msg_Err( p_intf, "You cannot run the MacOS X module as an "
+ "interface in clivlc mode. Please read the "
+ "README.MacOSX.rtf file.");
+ return VLC_EGENERIC;
+ }
+
+ /* If the main interface does not have a run function,
+ * implement a waiting loop ourselves
+ */
+ if( p_intf->pf_run )
+ RunInterface( p_intf );
+ else
+ {
+ while( !intf_ShouldDie( p_intf ) )
+ msleep( INTF_IDLE_SLEEP * 2);
+ }
+ vlc_object_kill( p_intf );
+ }
+ else
+ {
+ /* This interface doesn't need to be run */
+ if( !p_intf->pf_run )
+ return VLC_SUCCESS;
- /* Manage module bank */
- module_ManageBank( p_main->p_module_bank );
+ /* Run the interface in a separate thread */
+ if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
+ {
+ msg_Err( p_intf, "You cannot run the MacOS X module as an "
+ "extra interface. Please read the "
+ "README.MacOSX.rtf file.");
+ return VLC_EGENERIC;
+ }
- /* Check attached threads status */
- if( (p_intf->p_vout != NULL) && p_intf->p_vout->b_error )
- {
- /* FIXME: add aout error detection ?? */
- p_intf->b_die = 1;
- }
+ /* Run the interface in a separate thread */
+ if( vlc_thread_create( p_intf, "interface", RunInterface,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ {
+ msg_Err( p_intf, "cannot spawn interface thread" );
+ return VLC_EGENERIC;
+ }
+ }
- if( ( p_intf->p_input != NULL ) &&
- ( p_intf->p_input->b_error || p_intf->p_input->b_eof ) )
- {
- input_DestroyThread( p_intf->p_input, NULL );
- p_intf->p_input = NULL;
- intf_DbgMsg("Input thread destroyed");
- }
+ return VLC_SUCCESS;
+}
- /* Sleep to avoid using all CPU - since some interfaces needs
- * to access keyboard events, a 100ms delay is a good compromise */
- msleep( INTF_IDLE_SLEEP );
+/**
+ * Stops the interface thread
+ *
+ * This function asks the interface thread to stop
+ * \param p_intf the interface thread
+ * \return nothing
+ */
+void intf_StopThread( intf_thread_t *p_intf )
+{
+ /* Tell the interface to die */
+ if( !p_intf->b_block )
+ {
+ vlc_object_kill( p_intf );
+ if( p_intf->pf_run )
+ {
+ vlc_cond_signal( &p_intf->object_wait );
+ vlc_thread_join( p_intf );
}
}
}
-/*****************************************************************************
- * intf_Destroy: clean interface after main loop
- *****************************************************************************
- * This function destroys specific interfaces and close output devices.
- *****************************************************************************/
+/**
+ * \brief Destroy the interface after the main loop endeed.
+ *
+ * Destroys interfaces and closes output devices
+ * \param p_intf the interface thread
+ * \return nothing
+ */
void intf_Destroy( intf_thread_t *p_intf )
{
- p_intf_key p_cur;
- p_intf_key p_next;
- /* Destroy interfaces */
- p_intf->p_sys_destroy( p_intf );
- intf_ConsoleDestroy( p_intf->p_console );
-
- /* Unload channels */
- UnloadChannels( p_intf );
-
- /* Destroy keymap */
- p_cur = p_intf->p_keys;
- while( p_cur != NULL)
+ /* Unlock module if present (a switch may have failed) */
+ if( p_intf->p_module )
{
- p_next = p_cur->next;
- free(p_cur);
- p_cur = p_next;
+ module_Unneed( p_intf, p_intf->p_module );
}
-
+
+ vlc_mutex_destroy( &p_intf->change_lock );
+
/* Free structure */
- free( p_intf );
+ vlc_object_destroy( p_intf );
}
+
+/* Following functions are local */
+
/*****************************************************************************
- * intf_SelectChannel: change channel
- *****************************************************************************
- * Kill existing input, if any, and try to open a new one, using an input
- * configuration table.
+ * Manager: helper thread for blocking OS X
*****************************************************************************/
-int intf_SelectChannel( intf_thread_t * p_intf, int i_channel )
+#ifdef __APPLE__
+static void Manager( intf_thread_t *p_intf )
{
- /* FIXME */
-#if 0
- intf_channel_t * p_channel; /* channel */
-
- /* Look for channel in array */
- if( p_intf->p_channel != NULL )
+ while( !p_intf->b_die )
{
- for( p_channel = p_intf->p_channel; p_channel->i_channel != -1; p_channel++ )
- {
- if( p_channel->i_channel == i_channel )
- {
- /*
- * Change channel
- */
+ msleep( INTF_IDLE_SLEEP );
- /* Kill existing input, if any */
- if( p_intf->p_input != NULL )
+ if( p_intf->p_libvlc->b_die )
+ {
+ p_intf->b_die = VLC_TRUE;
+ if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) )
{
- input_DestroyThread( p_intf->p_input, NULL );
- }
-
- intf_Msg("Channel %d: %s", i_channel, p_channel->psz_description );
-
- /* Open a new input */
- p_intf->p_input = input_CreateThread( p_channel->i_input_method, p_channel->psz_input_source,
- p_channel->i_input_port, p_channel->i_input_vlan_id,
- p_intf->p_vout, p_main->p_aout, NULL );
- return( p_intf->p_input == NULL );
+ [NSApp stop: NULL];
}
+ return;
}
}
-
- /* Channel does not exist */
- intf_Msg("Channel %d does not exist", i_channel );
-#endif
- return( 1 );
}
+#endif
/*****************************************************************************
- * intf_AssignKey: assign standartkeys *
- *****************************************************************************
- * This function fills in the associative array that links the key pressed *
- * and the key we use internally. Support one extra parameter. *
- ****************************************************************************/
-void intf_AssignKey( intf_thread_t *p_intf, int r_key, int f_key, int param)
+ * RunInterface: setups necessary data and give control to the interface
+ *****************************************************************************/
+static void RunInterface( intf_thread_t *p_intf )
{
- p_intf_key p_cur = p_intf->p_keys;
- if( p_cur == NULL )
+ static const char *ppsz_interfaces[] =
{
- p_cur = (p_intf_key )(malloc ( sizeof( intf_key ) ) );
- p_cur->received_key = r_key;
- p_cur->forwarded.key = f_key;
- p_cur->forwarded.param = param;
- p_cur->next = NULL;
- p_intf->p_keys = p_cur;
- }
- else
+ "skins2", "Skins 2",
+#ifndef WIN32
+ "wxwidgets", "wxWidgets",
+#endif
+ NULL, NULL
+ };
+ const char **ppsz_parser;
+
+ vlc_list_t *p_list;
+ int i;
+ vlc_value_t val, text;
+ char *psz_intf;
+
+ /* Variable used for interface switching */
+ p_intf->psz_switch_intf = NULL;
+ var_Create( p_intf, "intf-switch", VLC_VAR_STRING |
+ VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Switch interface");
+ var_Change( p_intf, "intf-switch", VLC_VAR_SETTEXT, &text, NULL );
+
+ /* Only fill the list with available modules */
+ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ for( ppsz_parser = ppsz_interfaces; *ppsz_parser; ppsz_parser += 2 )
{
- while( p_cur->next != NULL && p_cur ->received_key != r_key)
+ for( i = 0; i < p_list->i_count; i++ )
{
- p_cur = p_cur->next;
- }
- if( p_cur->next == NULL )
- {
- p_cur->next = ( p_intf_key )( malloc( sizeof( intf_key ) ) );
- p_cur = p_cur->next;
- p_cur->next = NULL;
- p_cur->forwarded.param = param;
- p_cur->received_key = r_key;
+ module_t *p_module = (module_t *)p_list->p_values[i].p_object;
+ if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) )
+ {
+ val.psz_string = (char *)ppsz_parser[0];
+ text.psz_string = (char *)_(ppsz_parser[1]);
+ var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE,
+ &val, &text );
+ break;
+ }
}
- p_cur->forwarded.key = f_key;
- }
-}
-
-/* Basic getKey function... */
-keyparm intf_GetKey( intf_thread_t *p_intf, int r_key)
-{
- keyparm reply;
-
- p_intf_key current = p_intf->p_keys;
- while(current != NULL && current->received_key != r_key)
- {
- current = current->next;
}
- if(current == NULL)
- { /* didn't find any key in the array */
- reply.key = INTF_KEY_UNKNOWN;
- reply.param = 0;
- }
- else
+ vlc_list_release( p_list );
+
+ var_AddCallback( p_intf, "intf-switch", SwitchIntfCallback, NULL );
+
+ /* Variable used for interface spawning */
+ var_Create( p_intf, "intf-add", VLC_VAR_STRING |
+ VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Add Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
+
+ val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console";
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"telnet";
+ text.psz_string = (char *)_("Telnet Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"http";
+ text.psz_string = (char *)_("Web Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"logger";
+ text.psz_string = (char *)_("Debug logging");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"gestures";
+ text.psz_string = (char *)_("Mouse Gestures");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+
+ var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
+
+ do
{
- reply.key = current->forwarded.key;
- reply.param = current->forwarded.param;
- }
- return reply;
-}
+ /* Give control to the interface */
+ p_intf->pf_run( p_intf );
-/*****************************************************************************
-* intf_AssignNormalKeys: used for normal interfaces.
-*****************************************************************************
-* This function assign the basic key to the normal keys.
-*****************************************************************************/
+ /* Reset play on start status */
+ p_intf->b_play = VLC_FALSE;
-void intf_AssignNormalKeys( intf_thread_t *p_intf)
-{
- p_intf->p_intf_get_key = intf_GetKey;
-
- intf_AssignKey( p_intf , 'Q', INTF_KEY_QUIT, 0);
- intf_AssignKey( p_intf , 'q', INTF_KEY_QUIT, 0);
- intf_AssignKey( p_intf , 27, INTF_KEY_QUIT, 0);
- intf_AssignKey( p_intf , 3, INTF_KEY_QUIT, 0);
- intf_AssignKey( p_intf , '0', INTF_KEY_SET_CHANNEL, 0);
- intf_AssignKey( p_intf , '1', INTF_KEY_SET_CHANNEL, 1);
- intf_AssignKey( p_intf , '2', INTF_KEY_SET_CHANNEL, 2);
- intf_AssignKey( p_intf , '3', INTF_KEY_SET_CHANNEL, 3);
- intf_AssignKey( p_intf , '4', INTF_KEY_SET_CHANNEL, 4);
- intf_AssignKey( p_intf , '5', INTF_KEY_SET_CHANNEL, 5);
- intf_AssignKey( p_intf , '6', INTF_KEY_SET_CHANNEL, 6);
- intf_AssignKey( p_intf , '7', INTF_KEY_SET_CHANNEL, 7);
- intf_AssignKey( p_intf , '8', INTF_KEY_SET_CHANNEL, 8);
- intf_AssignKey( p_intf , '9', INTF_KEY_SET_CHANNEL, 9);
- intf_AssignKey( p_intf , '0', INTF_KEY_SET_CHANNEL, 0);
- intf_AssignKey( p_intf , '+', INTF_KEY_INC_VOLUME, 0);
- intf_AssignKey( p_intf , '-', INTF_KEY_DEC_VOLUME, 0);
- intf_AssignKey( p_intf , 'm', INTF_KEY_TOGGLE_VOLUME, 0);
- intf_AssignKey( p_intf , 'M', INTF_KEY_TOGGLE_VOLUME, 0);
- intf_AssignKey( p_intf , 'g', INTF_KEY_DEC_GAMMA, 0);
- intf_AssignKey( p_intf , 'G', INTF_KEY_INC_GAMMA, 0);
- intf_AssignKey( p_intf , 'c', INTF_KEY_TOGGLE_GRAYSCALE, 0);
- intf_AssignKey( p_intf , ' ', INTF_KEY_TOGGLE_INTERFACE, 0);
- intf_AssignKey( p_intf , 'i', INTF_KEY_TOGGLE_INFO, 0);
- intf_AssignKey( p_intf , 's', INTF_KEY_TOGGLE_SCALING, 0);
-}
-
-/*****************************************************************************
- * intf_ProcessKey: process standard keys
- *****************************************************************************
- * This function will process standard keys and return non 0 if the key was
- * unknown.
- *****************************************************************************/
-int intf_ProcessKey( intf_thread_t *p_intf, int g_key )
-{
- static int i_volbackup;
- keyparm k_reply;
-
- k_reply = intf_GetKey( p_intf, g_key);
-
- switch( k_reply.key )
- {
- case INTF_KEY_QUIT: /* quit order */
- p_intf->b_die = 1;
- break;
- case INTF_KEY_SET_CHANNEL:
- /* Change channel - return code is ignored since SelectChannel displays
- * its own error messages */
- intf_SelectChannel( p_intf, k_reply.param );
- break;
- case INTF_KEY_INC_VOLUME: /* volume + */
- if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLUME_MAX) )
- p_main->p_aout->vol += VOLUME_STEP;
- break;
- case INTF_KEY_DEC_VOLUME: /* volume - */
- if( (p_main->p_aout != NULL) && (p_main->p_aout->vol > VOLUME_STEP) )
- p_main->p_aout->vol -= VOLUME_STEP;
- break;
- case INTF_KEY_TOGGLE_VOLUME: /* toggle mute */
- if( (p_main->p_aout != NULL) && (p_main->p_aout->vol))
- {
- i_volbackup = p_main->p_aout->vol;
- p_main->p_aout->vol = 0;
- }
- else if( (p_main->p_aout != NULL) && (!p_main->p_aout->vol))
- p_main->p_aout->vol = i_volbackup;
- break;
- case INTF_KEY_DEC_GAMMA: /* gamma - */
- if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )
- {
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->f_gamma -= INTF_GAMMA_STEP;
- p_intf->p_vout->i_changes |= VOUT_GAMMA_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
- }
- break;
- case INTF_KEY_INC_GAMMA: /* gamma + */
- if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma < INTF_GAMMA_LIMIT) )
- {
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->f_gamma += INTF_GAMMA_STEP;
- p_intf->p_vout->i_changes |= VOUT_GAMMA_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
- }
- break;
- case INTF_KEY_TOGGLE_GRAYSCALE: /* toggle grayscale */
- if( p_intf->p_vout != NULL )
- {
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->b_grayscale = !p_intf->p_vout->b_grayscale;
- p_intf->p_vout->i_changes |= VOUT_GRAYSCALE_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
- }
- break;
- case INTF_KEY_TOGGLE_INTERFACE: /* toggle interface */
- if( p_intf->p_vout != NULL )
- {
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->b_interface = !p_intf->p_vout->b_interface;
- p_intf->p_vout->i_changes |= VOUT_INTF_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
- }
- break;
- case INTF_KEY_TOGGLE_INFO: /* toggle info */
- if( p_intf->p_vout != NULL )
+ if( !p_intf->psz_switch_intf )
{
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->b_info = !p_intf->p_vout->b_info;
- p_intf->p_vout->i_changes |= VOUT_INFO_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
+ break;
}
- break;
- case INTF_KEY_TOGGLE_SCALING: /* toggle scaling */
- if( p_intf->p_vout != NULL )
- {
- vlc_mutex_lock( &p_intf->p_vout->change_lock );
- p_intf->p_vout->b_scale = !p_intf->p_vout->b_scale;
- p_intf->p_vout->i_changes |= VOUT_SCALE_CHANGE;
- vlc_mutex_unlock( &p_intf->p_vout->change_lock );
- }
- break;
- default: /* unknown key */
- return( 1 );
- }
- return( 0 );
-}
+ /* Make sure the old interface is completely uninitialized */
+ module_Unneed( p_intf, p_intf->p_module );
-/* following functions are local */
+ /* Provide ability to switch the main interface on the fly */
+ psz_intf = p_intf->psz_switch_intf;
+ p_intf->psz_switch_intf = NULL;
-/*****************************************************************************
- * LoadChannels: load channels description from a file
- *****************************************************************************
- * This structe describes all interface-specific data of the main (interface)
- * thread.
- * Each line of the file is a semicolon separated list of the following
- * fields :
- * integer channel number
- * string channel description
- * integer input method (see input.h)
- * string input source
- * integer input port
- * integer input vlan id
- * The last field must end with a semicolon.
- * Comments and empty lines are not explicitely allowed, but lines with parsing
- * errors are ignored without warning.
- *****************************************************************************/
-static int LoadChannels( intf_thread_t *p_intf, char *psz_filename )
+ vlc_mutex_lock( &p_intf->object_lock );
+ p_intf->b_die = VLC_FALSE; /* FIXME */
+ p_intf->b_dead = VLC_FALSE;
+ vlc_mutex_unlock( &p_intf->object_lock );
+
+ p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
+ free( psz_intf );
+ }
+ while( p_intf->p_module );
+}
+
+static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- FILE * p_file; /* file */
- intf_channel_t * p_channel; /* current channel */
- char psz_line[INTF_MAX_CMD_SIZE]; /* line buffer */
- int i_index; /* channel or field index */
+ intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ (void)psz_cmd; (void)oldval; (void)p_data;
- /* Set default value */
- p_intf->p_channel = NULL;
+ p_intf->psz_switch_intf =
+ malloc( strlen(newval.psz_string) + sizeof(",none") );
+ sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string );
+ vlc_object_kill( p_intf );
- /* FIXME: channels are disabled */
- //return( 0 );
+ return VLC_SUCCESS;
+}
- /* Open file */
- p_file = fopen( psz_filename, "r" );
- if( p_file == NULL )
- {
- intf_DbgMsg( "intf warning: cannot open %s (%s)",
- psz_filename, strerror(errno) );
- return( 1 );
- }
+static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ intf_thread_t *p_intf;
+ char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") );
+
+ (void)psz_cmd; (void)oldval; (void)p_data;
- /* First pass: count number of lines */
- for( i_index = 0; fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL; i_index++ )
+ /* Try to create the interface */
+ sprintf( psz_intf, "%s,none", newval.psz_string );
+ p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
+ free( psz_intf );
+ if( p_intf == NULL )
{
- ;
+ msg_Err( p_this, "interface \"%s\" initialization failed",
+ newval.psz_string );
+ return VLC_EGENERIC;
}
- if( i_index != 0 )
+ /* Try to run the interface */
+ p_intf->b_block = VLC_FALSE;
+ if( intf_RunThread( p_intf ) != VLC_SUCCESS )
{
- /* Allocate array and rewind - some of the lines may be invalid, and the
- * array will probably be larger than the actual number of channels, but
- * it has no consequence. */
- p_intf->p_channel = malloc( sizeof( intf_channel_t ) * i_index );
- if( p_intf->p_channel == NULL )
- {
- intf_ErrMsg( "intf error: cannot create intf_channel_t (%s)",
- strerror(ENOMEM) );
- fclose( p_file );
- return( 1 );
- }
- p_channel = p_intf->p_channel;
- rewind( p_file );
-
- /* Second pass: read channels descriptions */
- while( fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL )
- {
- if( !ParseChannel( p_channel, psz_line ) )
- {
- intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan id %d)",
- p_channel->i_channel, p_channel->psz_description,
- p_channel->i_input_method,
- p_channel->psz_input_source,
- p_channel->i_input_port, p_channel->i_input_vlan_id );
- p_channel++;
- }
- }
-
- /* Add marker at the end of the array */
- p_channel->i_channel = -1;
+ vlc_object_detach( p_intf );
+ intf_Destroy( p_intf );
+ return VLC_EGENERIC;
}
- /* Close file */
- fclose( p_file );
- return( 0 );
+ return VLC_SUCCESS;
}
+#ifdef __APPLE__
/*****************************************************************************
- * UnloadChannels: unload channels description
- *****************************************************************************
- * This function free all resources allocated by LoadChannels, if any.
+ * VLCApplication implementation
*****************************************************************************/
-static void UnloadChannels( intf_thread_t *p_intf )
-{
- int i_channel; /* channel index */
+@implementation VLCApplication
- if( p_intf->p_channel != NULL )
- {
- /* Free allocated strings */
- for( i_channel = 0;
- p_intf->p_channel[ i_channel ].i_channel != -1;
- i_channel++ )
- {
- if( p_intf->p_channel[ i_channel ].psz_description != NULL )
- {
- free( p_intf->p_channel[ i_channel ].psz_description );
- }
- if( p_intf->p_channel[ i_channel ].psz_input_source != NULL )
- {
- free( p_intf->p_channel[ i_channel ].psz_input_source );
- }
- }
-
- /* Free array */
- free( p_intf->p_channel );
- p_intf->p_channel = NULL;
- }
+- (void)setVLC: (libvlc_int_t *) p_libvlc
+{
+ o_libvlc = p_libvlc;
}
-
-/*****************************************************************************
- * ParseChannel: parse a channel description line
- *****************************************************************************
- * See LoadChannels. This function return non 0 on parsing error.
- *****************************************************************************/
-static int ParseChannel( intf_channel_t *p_channel, char *psz_str )
+- (void)terminate: (id)sender
{
- char * psz_index; /* current character */
- char * psz_end; /* end pointer for strtol */
- int i_field; /* field number, -1 on error */
- int i_field_length; /* field length, for text fields */
-
- /* Set some default fields */
- p_channel->i_channel = 0;
- p_channel->psz_description = NULL;
- p_channel->i_input_method = 0;
- p_channel->psz_input_source = NULL;
- p_channel->i_input_port = 0;
- p_channel->i_input_vlan_id = 0;
-
- /* Parse string */
- i_field = 0;
- for( psz_index = psz_str; (i_field != -1) && (*psz_index != '\0'); psz_index++ )
- {
- if( *psz_index == ';' )
- {
- /* Mark end of field */
- *psz_index = '\0';
-
- /* Parse field */
- switch( i_field++ )
- {
- case 0: /* channel number */
- p_channel->i_channel = strtol( psz_str, &psz_end, 0);
- if( (*psz_str == '\0') || (*psz_end != '\0') )
- {
- i_field = -1;
- }
- break;
- case 1: /* channel description */
- i_field_length = strlen( psz_str );
- if( i_field_length != 0 )
- {
- p_channel->psz_description = malloc( i_field_length + 1 );
- if( p_channel->psz_description == NULL )
- {
- intf_ErrMsg( "intf error: cannot create channel "
- "description (%s)", strerror( ENOMEM ) );
- i_field = -1;
- }
- else
- {
- strcpy( p_channel->psz_description, psz_str );
- }
- }
- break;
- case 2: /* input method */
- p_channel->i_input_method = strtol( psz_str, &psz_end, 0);
- if( (*psz_str == '\0') || (*psz_end != '\0') )
- {
- i_field = -1;
- }
- break;
- case 3: /* input source */
- i_field_length = strlen( psz_str );
- if( i_field_length != 0 )
- {
- p_channel->psz_input_source = malloc( i_field_length + 1 );
- if( p_channel->psz_input_source == NULL )
- {
- intf_ErrMsg( "intf error: cannot create input "
- "source (%s)", strerror( ENOMEM ) );
- i_field = -1;
- }
- else
- {
- strcpy( p_channel->psz_input_source, psz_str );
- }
- }
- break;
- case 4: /* input port */
- p_channel->i_input_port = strtol( psz_str, &psz_end, 0);
- if( (*psz_str == '\0') || (*psz_end != '\0') )
- {
- i_field = -1;
- }
- break;
- case 5: /* input vlan id */
- p_channel->i_input_vlan_id = strtol( psz_str, &psz_end, 0);
- if( (*psz_str == '\0') || (*psz_end != '\0') )
- {
- i_field = -1;
- }
- break;
- /* ... following fields are ignored */
- }
-
- /* Set new beginning of field */
- psz_str = psz_index + 1;
- }
- }
+ vlc_object_kill( o_libvlc );
+ [super terminate: sender];
+}
- /* At least the first three fields must be parsed sucessfully for function
- * success. Other parsing errors are returned using i_field = -1. */
- if( i_field < 3 )
- {
- /* Function fails. Free allocated strings */
- if( p_channel->psz_description != NULL )
- {
- free( p_channel->psz_description );
- }
- if( p_channel->psz_input_source != NULL )
- {
- free( p_channel->psz_input_source );
- }
- return( 1 );
- }
+@end
+#endif
- /* Return success */
- return( 0 );
-}
projects / vlc / blobdiff