X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=7ed0822ede3d88a4fbed96fd5ef805bf77d3f267;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=67acc2bf15bd6f4e23edb517200ddc414e8d6433;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 67acc2bf15..7ed0822ede 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -3,7 +3,7 @@ * This library provides basic functions for threads to interact with user * interface, such as command line. ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 1998-2007 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -20,7 +20,7 @@ * * 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. *****************************************************************************/ /** @@ -32,27 +32,22 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ #include -#include -#include "audio_output.h" +#include +#include #include "vlc_interface.h" -#include "vlc_video.h" -#include "video_output.h" +#include "modules/modules.h" // Gruik! -#ifdef SYS_DARWIN -# include "Cocoa/Cocoa.h" -#endif /* SYS_DARWIN */ +#ifdef __APPLE__ +# include +#endif /***************************************************************************** * Local prototypes *****************************************************************************/ -static void Manager( intf_thread_t *p_intf ); static void RunInterface( intf_thread_t *p_intf ); static int SwitchIntfCallback( vlc_object_t *, char const *, @@ -60,14 +55,18 @@ static int SwitchIntfCallback( vlc_object_t *, char const *, static int AddIntfCallback( vlc_object_t *, char const *, vlc_value_t , vlc_value_t , void * ); -#ifdef SYS_DARWIN +#ifdef __APPLE__ +static void Manager( intf_thread_t *p_intf ); /***************************************************************************** * VLCApplication interface *****************************************************************************/ @interface VLCApplication : NSApplication { + libvlc_int_t *o_libvlc; } +- (void)setVLC: (libvlc_int_t *)p_libvlc; + @end #endif @@ -79,14 +78,19 @@ static int AddIntfCallback( vlc_object_t *, char const *, *****************************************************************************/ /** * 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 prefered interface module + * \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 ) +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; + int i; /* Allocate structure */ p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); @@ -99,13 +103,19 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) p_intf->pf_release_window = NULL; p_intf->pf_control_window = NULL; p_intf->b_play = VLC_FALSE; + p_intf->b_interaction = VLC_FALSE; + + for( i = 0 ; i< i_options; i++ ) + { + var_OptionParse( p_intf, ppsz_options[i] ); + } /* Choose the best module */ - p_intf->p_module = module_Need( p_intf, "interface", psz_module, 0 ); + p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE ); if( p_intf->p_module == NULL ) { - msg_Err( p_intf, "no suitable intf module" ); + msg_Err( p_intf, "no suitable interface module" ); vlc_object_destroy( p_intf ); return NULL; } @@ -117,8 +127,6 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) /* Initialize mutexes */ vlc_mutex_init( p_intf, &p_intf->change_lock ); - msg_Dbg( p_intf, "interface initialized" ); - /* Attach interface to its parent object */ vlc_object_attach( p_intf, p_this ); @@ -141,71 +149,67 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) */ int intf_RunThread( intf_thread_t *p_intf ) { -#ifdef SYS_DARWIN +#ifdef __APPLE__ NSAutoreleasePool * o_pool; - if( p_intf->b_block ) - { - /* This is the primary intf */ - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manager", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) - { - msg_Err( p_intf, "cannot spawn manager thread" ); - return VLC_EGENERIC; - } - } - - if( p_intf->b_block && strncmp( p_intf->p_module->psz_object_name, + /* If !clivlc, then run as a OS X application */ + if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6) ) { o_pool = [[NSAutoreleasePool alloc] init]; [VLCApplication sharedApplication]; - } + [NSApp setVLC: p_intf->p_libvlc]; - if( p_intf->b_block && - ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || - !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) ) - { - /* VLC in normal primary interface mode */ - RunInterface( p_intf ); - p_intf->b_die = VLC_TRUE; + if( p_intf->pf_run ) + RunInterface( p_intf ); + else + { + [NSApp run]; + while( !intf_ShouldDie( p_intf ) ) + msleep( INTF_IDLE_SLEEP * 2); + } + vlc_object_kill( p_intf ); } else +#endif + if( p_intf->b_block ) { - /* Run the interface in a separate thread */ - if( vlc_thread_create( p_intf, "interface", RunInterface, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + /* If we are clivlc+macosx, don't run the macosx GUI */ + if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) ) { - msg_Err( p_intf, "cannot spawn interface thread" ); + 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( p_intf->b_block ) + + /* If the main interface does not have a run function, + * implement a waiting loop ourselves + */ + if( p_intf->pf_run ) + RunInterface( p_intf ); + else { - /* VLC in primary interface mode with a working macosx vout */ - [NSApp run]; - p_intf->b_die = VLC_TRUE; + while( !intf_ShouldDie( p_intf ) ) + msleep( INTF_IDLE_SLEEP * 2); } + vlc_object_kill( p_intf ); } -#else - if( p_intf->b_block ) + else { - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manager", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + /* This interface doesn't need to be run */ + if( !p_intf->pf_run ) + return VLC_SUCCESS; + + /* Run the interface in a separate thread */ + if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) ) { - msg_Err( p_intf, "cannot spawn manager thread" ); + 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; } - RunInterface( p_intf ); - - p_intf->b_die = VLC_TRUE; - /* Do not join the thread... intf_StopThread will do it for us */ - } - else - { /* Run the interface in a separate thread */ if( vlc_thread_create( p_intf, "interface", RunInterface, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) @@ -214,7 +218,6 @@ int intf_RunThread( intf_thread_t *p_intf ) return VLC_EGENERIC; } } -#endif return VLC_SUCCESS; } @@ -231,11 +234,13 @@ void intf_StopThread( intf_thread_t *p_intf ) /* Tell the interface to die */ if( !p_intf->b_block ) { - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); + if( p_intf->pf_run ) + { + vlc_cond_signal( &p_intf->object_wait ); + vlc_thread_join( p_intf ); + } } - - /* Wait for the thread to exit */ - vlc_thread_join( p_intf ); } /** @@ -263,56 +268,42 @@ void intf_Destroy( intf_thread_t *p_intf ) /* Following functions are local */ /***************************************************************************** - * Manager: helper thread for blocking interfaces - ***************************************************************************** - * If the interface is launched in the main thread, it will not listen to - * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die. - * This thread takes care of the matter. + * Manager: helper thread for blocking OS X *****************************************************************************/ -/** - * \brief Helper thread for blocking interfaces. - * \ingroup vlc_interface - * - * This is a local function - * If the interface is launched in the main thread, it will not listen to - * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die. - * This thread takes care of the matter. - * \see intf_RunThread - * \param p_intf an interface thread - * \return nothing - */ +#ifdef __APPLE__ static void Manager( intf_thread_t *p_intf ) { while( !p_intf->b_die ) { msleep( INTF_IDLE_SLEEP ); - if( p_intf->p_vlc->b_die ) + if( p_intf->p_libvlc->b_die ) { p_intf->b_die = VLC_TRUE; -#ifdef SYS_DARWIN - if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) - { - [NSApp stop: NULL]; - } -#endif + if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) + { + [NSApp stop: NULL]; + } return; } } } +#endif /***************************************************************************** * RunInterface: setups necessary data and give control to the interface *****************************************************************************/ static void RunInterface( intf_thread_t *p_intf ) { - static char *ppsz_interfaces[] = + static const char *ppsz_interfaces[] = { "skins2", "Skins 2", - "wxwindows", "wxWindows", +#ifndef WIN32 + "wxwidgets", "wxWidgets", +#endif NULL, NULL }; - char **ppsz_parser; + const char **ppsz_parser; vlc_list_t *p_list; int i; @@ -335,8 +326,8 @@ static void RunInterface( intf_thread_t *p_intf ) 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 = ppsz_parser[0]; - text.psz_string = ppsz_parser[1]; + 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; @@ -353,15 +344,19 @@ static void RunInterface( intf_thread_t *p_intf ) text.psz_string = _("Add Interface"); var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = "rc"; text.psz_string = "Console"; + val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console"; var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "telnet"; text.psz_string = "Telnet Interface"; + 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 = "http"; text.psz_string = "Web Interface"; + 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 = "logger"; text.psz_string = "Debug logging"; + 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 = "gestures"; text.psz_string = "Mouse Gestures"; + 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 ); @@ -387,7 +382,7 @@ static void RunInterface( intf_thread_t *p_intf ) p_intf->psz_switch_intf = NULL; vlc_mutex_lock( &p_intf->object_lock ); - p_intf->b_die = VLC_FALSE; + p_intf->b_die = VLC_FALSE; /* FIXME */ p_intf->b_dead = VLC_FALSE; vlc_mutex_unlock( &p_intf->object_lock ); @@ -401,11 +396,12 @@ static int SwitchIntfCallback( 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 = (intf_thread_t *)p_this; + (void)psz_cmd; (void)oldval; (void)p_data; p_intf->psz_switch_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string ); - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); return VLC_SUCCESS; } @@ -416,9 +412,11 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, intf_thread_t *p_intf; char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); + (void)psz_cmd; (void)oldval; (void)p_data; + /* Try to create the interface */ sprintf( psz_intf, "%s,none", newval.psz_string ); - p_intf = intf_Create( p_this->p_vlc, psz_intf ); + p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL ); free( psz_intf ); if( p_intf == NULL ) { @@ -439,33 +437,20 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } -#ifdef SYS_DARWIN +#ifdef __APPLE__ /***************************************************************************** - * VLCApplication implementation + * VLCApplication implementation *****************************************************************************/ -@implementation VLCApplication +@implementation VLCApplication -- (void)stop: (id)sender +- (void)setVLC: (libvlc_int_t *) p_libvlc { - NSEvent *o_event; - NSAutoreleasePool *o_pool; - [super stop:sender]; - - o_pool = [[NSAutoreleasePool alloc] init]; - /* send a dummy event to break out of the event loop */ - o_event = [NSEvent mouseEventWithType: NSLeftMouseDown - location: NSMakePoint( 1, 1 ) modifierFlags: 0 - timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber] - context: [NSGraphicsContext currentContext] eventNumber: 1 - clickCount: 1 pressure: 0.0]; - [NSApp postEvent: o_event atStart: YES]; - [o_pool release]; + o_libvlc = p_libvlc; } - (void)terminate: (id)sender { - if( [NSApp isRunning] ) - [NSApp stop:sender]; + vlc_object_kill( o_libvlc ); [super terminate: sender]; }