-$Id: README,v 1.1 2003/07/07 16:59:00 sam Exp $
+$Id: README,v 1.2 2004/01/25 16:17:03 anil Exp $
* Module (server) side
** Dependencies
-To compile the CORBA plugin, you need the orbit2 developpement files
+To compile the CORBA module, you need the orbit2 developpement files
(for Debian, install the package liborbi2-dev)
** How to run it ?
except:
pass
-print "Chargement de l'IDL"
+print "IDL loading"
ORBit.load_typelib ("./MediaControl.so")
import VLC
print "Usage: %s" % sys.argv[0]
sys.exit(1)
-print "Initialisation de l'ORB"
+print "ORB initialization"
orb = CORBA.ORB_init()
ior = open("/tmp/vlc-ior.ref").readline()
mc = orb.string_to_object(ior)
-print "Objet mc %s" % mc
+print "Object mc %s" % mc
pos = mc.get_media_position (0,0)
print "pos = mc.get_media_position (0,0)"
/*****************************************************************************
- * corba.c : CORBA (ORBit) remote control plugin for vlc
+ * corba.c : CORBA (ORBit) remote control module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: corba.c,v 1.3 2004/01/05 13:07:02 zorglub Exp $
+ * $Id: corba.c,v 1.4 2004/01/25 16:17:03 anil Exp $
*
* Authors: Olivier Aubert <oaubert at lisi dot univ-lyon1 dot fr>
*
}
/* We are asked for an AbsolutePosition. */
- /* Cf plugins/gtk/gtk_display.c */
+ /* Cf modules/gui/gtk/gtk_display.c */
/* The lock is taken by the currentOffset function */
l_offset = currentOffset (p_input);
{
/* FIXME: we should raise an appropriate exception, but we must
define it in the IDL first */
- msg_Err (servant->p_intf, "Error: no playlist available.");
+ msg_Err (servant->p_intf, "no playlist available");
return;
}
{
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
- msg_Err (servant->p_intf, "Error: playlist empty.");
+ msg_Err (servant->p_intf, "playlist empty");
}
return;
{
input_thread_t *p_input = servant->p_intf->p_sys->p_input;
- msg_Warn (servant->p_intf, "Calling MediaControl::pause");
+ msg_Warn (servant->p_intf, "calling MediaControl::pause");
if( p_input != NULL )
{
{
input_thread_t *p_input = servant->p_intf->p_sys->p_input;
- msg_Warn (servant->p_intf, "Calling MediaControl::resume");
+ msg_Warn (servant->p_intf, "calling MediaControl::resume");
if( p_input != NULL )
{
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- msg_Warn (servant->p_intf, "Calling MediaControl::stop");
+ msg_Warn (servant->p_intf, "calling MediaControl::stop");
if( p_playlist != NULL )
{
impl_VLC_MediaControl_exit(impl_POA_VLC_MediaControl * servant,
CORBA_Environment * ev)
{
- msg_Warn (servant->p_intf, "Calling MediaControl::exit");
+ msg_Warn (servant->p_intf, "calling MediaControl::exit");
vlc_mutex_lock( &servant->p_intf->change_lock );
servant->p_intf->b_die = TRUE;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- msg_Warn (servant->p_intf, "Calling MediaControl::add_to_playlist %s", psz_file);
+ msg_Warn (servant->p_intf, "calling MediaControl::add_to_playlist %s", psz_file);
if ( p_playlist == NULL )
{
- msg_Err (servant->p_intf, "Error: no playlist defined");
+ msg_Err (servant->p_intf, "no playlist defined");
/* FIXME: should return an exception */
return;
}
FIND_ANYWHERE );
int i_playlist_size;
- msg_Warn (servant->p_intf, "Calling MediaControl::get_playlist");
+ msg_Warn (servant->p_intf, "calling MediaControl::get_playlist");
vlc_mutex_lock( &p_playlist->object_lock );
i_playlist_size = p_playlist->i_size;
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- add_category_hint( N_("Corba control"), NULL, VLC_FALSE );
- set_description( _("corba control module") );
+ set_description( _("Corba control module") );
set_capability( "interface", 10 );
set_callbacks( Open, Close );
vlc_module_end();
ev = CORBA_exception__alloc ();
CORBA_ORB_shutdown (p_intf->p_sys->orb, FALSE, ev);
- handle_exception_no_servant (p_intf, "Erreur dans Close");
+ handle_exception_no_servant (p_intf, "erreur dans Close");
if( p_intf->p_sys->p_input )
{
b_work_pending = CORBA_ORB_work_pending (p_intf->p_sys->orb, ev);
if(ev->_major != CORBA_NO_EXCEPTION)
{
- msg_Err (p_intf, "Exception dans la vérif d'événements CORBA");
+ msg_Err (p_intf, "exception in the CORBA events check");
return FALSE;
}
cleaning it */
/* p_intf->p_sys->orb = gnome_CORBA_init ("VLC", NULL, &argc, &argv, 0, NULL, ev); */
- handle_exception_no_servant (p_intf, "Exception during CORBA_ORB_init");
+ handle_exception_no_servant (p_intf, "exception during CORBA_ORB_init");
p_intf->p_sys->root_poa = (PortableServer_POA)CORBA_ORB_resolve_initial_references(p_intf->p_sys->orb, "RootPOA", ev);
- handle_exception ("Exception during RootPOA initialization");
+ handle_exception ("exception during RootPOA initialization");
p_intf->p_sys->mc = impl_VLC_MediaControl__create(p_intf->p_sys->root_poa, ev);
- handle_exception ("Exception during MediaControl initialization");
+ handle_exception ("exception during MediaControl initialization");
servant = (impl_POA_VLC_MediaControl*)PortableServer_POA_reference_to_servant(p_intf->p_sys->root_poa, p_intf->p_sys->mc, ev);
- handle_exception ("Exception during MediaControl access");
+ handle_exception ("exception during MediaControl access");
servant->p_intf = p_intf;
psz_objref = CORBA_ORB_object_to_string(p_intf->p_sys->orb, p_intf->p_sys->mc, ev);
- handle_exception ("Exception during IOR generation");
+ handle_exception ("exception during IOR generation");
msg_Warn (p_intf, "MediaControl IOR :");
msg_Warn (p_intf, psz_objref);
fp = fopen (VLC_IOR_FILE, "w");
if (fp == NULL)
{
- msg_Err (servant->p_intf, "Cannot write the IOR to %s (%d).", VLC_IOR_FILE, errno);
+ msg_Err (servant->p_intf, "cannot write the IOR to %s (%d).", VLC_IOR_FILE, errno);
}
else
{
msg_Warn (p_intf, "get_the_POAManager (state %s)", p_intf->p_sys->root_poa);
p_intf->p_sys->root_poa_manager = PortableServer_POA__get_the_POAManager(p_intf->p_sys->root_poa, ev);
- handle_exception ("Exception during POAManager resolution");
+ handle_exception ("exception during POAManager resolution");
- msg_Warn (p_intf, "Activating POAManager");
+ msg_Warn (p_intf, "activating POAManager");
PortableServer_POAManager_activate(p_intf->p_sys->root_poa_manager, ev);
- handle_exception ("Exception during POAManager activation");
+ handle_exception ("exception during POAManager activation");
msg_Info(p_intf, "corba remote control interface initialized" );
name_service = CORBA_ORB_resolve_initial_references (p_intf->p_sys->orb,
"NameService",
ev);
- handle_exception ("Error: could not get name service: %s\n",
+ handle_exception ("could not get name service: %s\n",
CORBA_exception_id(ev));
msg_Warn (p_intf, "Name service OK");
CosNaming_NamingContext_bind (name_service, &name, p_intf->p_sys->mc, ev);
- handle_exception ("Error: could not register object: %s\n",
+ handle_exception ("could not register object: %s\n",
CORBA_exception_id(ev));
}
*/
i_event_source = g_timeout_add (INTF_IDLE_SLEEP / 10000,
Manage,
p_intf);
- msg_Warn (p_intf, "Entering mainloop");
+ msg_Warn (p_intf, "entering mainloop");
p_intf->p_sys->corbaloop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (p_intf->p_sys->corbaloop);
g_source_remove( i_event_source );
unlink (VLC_IOR_FILE);
- msg_Warn (p_intf, "Normal termination of VLC corba plugin");
+ msg_Warn (p_intf, "normal termination of VLC corba module");
return;
}
self.gui.get_widget ("win").set_title (title)
def launch_player (self):
- """Launch the VLC corba plugin"""
+ """Launch the VLC corba module"""
#print "Launching vlc server..."
# FIXME: spawn is portable, but how can we make sure that
# launch-vlc-corba launches the application in the background ?
/*****************************************************************************
- * geatures.c: control vlc with mouse gestures
+ * gestures.c: control vlc with mouse gestures
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: gestures.c,v 1.6 2003/11/05 00:39:16 gbazin Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: gestures.c,v 1.7 2004/01/25 16:17:03 anil Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define THRESHOLD_TEXT N_( "Motion threshold" )
+#define THRESHOLD_TEXT N_( "Motion threshold (10-100)" )
#define THRESHOLD_LONGTEXT N_( \
- "the amount of movement required for a mouse" \
- " gesture to be recorded" )
+ "Amount of movement required for a mouse" \
+ " gesture to be recorded." )
-#define BUTTON_TEXT N_( "Mouse button" )
+#define BUTTON_TEXT N_( "Trigger button" )
#define BUTTON_LONGTEXT N_( \
- "the mouse button to be held down during mouse gestures" )
+ "You can set the trigger button for mouse gestures here." )
static char *button_list[] = { "left", "middle", "right" };
static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") };
vlc_module_begin();
- add_category_hint( N_( "Gestures" ), NULL, VLC_FALSE );
add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
add_string( "gestures-button", "right", NULL,
BUTTON_TEXT, BUTTON_LONGTEXT, VLC_FALSE );
change_string_list( button_list, button_list_text, 0 );
- set_description( _("mouse gestures control interface") );
+ set_description( _("Mouse gestures control interface") );
set_capability( "interface", 0 );
set_callbacks( E_(Open), E_(Close) );
p_intf->p_vlc->b_die = VLC_TRUE;
break;
case GESTURE(DOWN,LEFT,UP,RIGHT):
- msg_Dbg(p_intf, "A square!" );
+ msg_Dbg(p_intf, "a square!" );
break;
default:
break;
/*****************************************************************************
* hotkeys.c: Hotkey handling for vlc
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: hotkeys.c,v 1.15 2003/12/15 13:38:27 hartman Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: hotkeys.c,v 1.16 2004/01/25 16:17:03 anil Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
#define BOOKMARK9_TEXT N_("Playlist bookmark 9")
#define BOOKMARK10_TEXT N_("Playlist bookmark 10")
#define BOOKMARK_LONGTEXT N_( \
- "This option allows you to define playlist bookmarks")
+ "This option allows you to define playlist bookmarks.")
vlc_module_begin();
- set_description( _("hotkey interface") );
+ set_description( _("Hotkeys management interface") );
add_string( "bookmark1", NULL, NULL,
BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
add_string( "bookmark2", NULL, NULL,
if( i_action == ACTIONID_QUIT )
{
p_intf->p_vlc->b_die = VLC_TRUE;
- vout_OSDMessage( VLC_OBJECT(p_intf), _("Quit" ) );
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Quit" ) );
continue;
}
else if( i_action == ACTIONID_VOL_UP )
aout_VolumeMute( p_intf, &i_newvol );
if( i_newvol == 0 )
{
- vout_OSDMessage( VLC_OBJECT(p_intf), "Mute" );
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Mute" ) );
}
else
{
vlc_mutex_lock( &p_intf->p_sys->change_lock );
if ( p_intf->p_sys->i_size == BUFFER_SIZE )
{
- msg_Warn( p_intf, "Event buffer full, dropping keypress" );
+ msg_Warn( p_intf, "event buffer full, dropping keypress" );
vlc_mutex_unlock( &p_intf->p_sys->change_lock );
return VLC_EGENERIC;
}
var_Create( p_intf, psz_bookmark_name, VLC_VAR_STRING|VLC_VAR_DOINHERIT );
val.psz_string = strdup( p_playlist->pp_items[p_playlist->i_index]->psz_uri );
var_Set( p_intf, psz_bookmark_name, val );
- msg_Info( p_intf, "Setting playlist bookmark %i to %s", i_num, val.psz_string );
+ msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num, val.psz_string );
vlc_object_release( p_playlist );
}
}
* http.c : http mini-server ;)
*****************************************************************************
* Copyright (C) 2001-2004 VideoLAN
- * $Id: http.c,v 1.49 2004/01/18 07:35:31 fenrir Exp $
+ * $Id: http.c,v 1.50 2004/01/25 16:17:03 anil Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
#define HOST_TEXT N_( "Host address" )
#define HOST_LONGTEXT N_( \
- "You can set the address and port on which the http interface will bind" )
+ "You can set the address and port the http interface will bind to." )
#define SRC_TEXT N_( "Source directory" )
#define SRC_LONGTEXT N_( "Source directory" )
vlc_module_begin();
set_description( _("HTTP remote control interface") );
- add_category_hint( N_("HTTP remote control"), NULL, VLC_TRUE );
add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, VLC_TRUE );
set_capability( "interface", 0 );
f = malloc( sizeof( httpd_file_callback_args_t ) );
if( !f )
{
- msg_Err( p_intf, "Out of memory" );
+ msg_Err( p_intf, "out of memory" );
closedir( p_dir );
return( VLC_ENOMEM );
}
if( !f->name || !f->mime )
{
- msg_Err( p_intf , "Unable to parse directory" );
+ msg_Err( p_intf , "unable to parse directory" );
closedir( p_dir );
free( f );
return( VLC_ENOMEM );
f = malloc( sizeof( httpd_file_callback_args_t ) );
if( !f )
{
- msg_Err( p_intf, "Out of memory" );
+ msg_Err( p_intf, "out of memory" );
closedir( p_dir );
return( VLC_ENOMEM );
}
/*****************************************************************************
* joystick.c: control vlc with a joystick
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: joystick.c,v 1.3 2003/12/22 02:24:51 sam Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: joystick.c,v 1.4 2004/01/25 16:17:03 anil Exp $
*
* Authors: Clément Stenac <zorglub@via.ecp.fr>
*
*****************************************************************************/
#define THRESHOLD_TEXT N_( "Motion threshold" )
#define THRESHOLD_LONGTEXT N_( \
- "The amount of joystick movement required for a movement to be " \
- "recorded (0->32767)" )
+ "Amount of joystick movement required for a movement to be " \
+ "recorded (0->32767)." )
#define DEVICE_TEXT N_( "Joystick device" )
#define DEVICE_LONGTEXT N_( \
- "The joystick device (usually /dev/js0 or /dev/input/js0)")
+ "The joystick device (usually /dev/js0 or /dev/input/js0).")
-#define REPEAT_TEXT N_( "Repeat time" )
+#define REPEAT_TEXT N_( "Repeat time (ms)" )
#define REPEAT_LONGTEXT N_( \
- "The time waited before the action is repeated if it is still " \
- "triggered, in milliseconds" )
+ "Delay waited before the action is repeated if it is still " \
+ "triggered, in milliseconds." )
-#define WAIT_TEXT N_( "Wait time")
+#define WAIT_TEXT N_( "Wait time (ms)")
#define WAIT_LONGTEXT N_(\
"The time waited before the repeat starts, in milliseconds.")
-#define SEEK_TEXT N_( "Max seek interval")
+#define SEEK_TEXT N_( "Max seek interval (seconds)")
#define SEEK_LONGTEXT N_(\
"The maximum number of seconds that will be seeked at a time." )
#define MAP_TEXT N_( "Action mapping")
-#define MAP_LONGTEXT N_(\
- "Allows you to remap the actions. For details," \
- " please have a look at http://wiki.videolan.org/index.php/Joystick" )
+#define MAP_LONGTEXT N_( "Allows you to remap the actions." )
vlc_module_begin();
- add_category_hint( N_( "Joystick" ), NULL, VLC_FALSE );
add_integer( "motion-threshold", DEFAULT_THRESHOLD , NULL,
THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
add_string( "joystick-device", DEFAULT_DEVICE , NULL,
SEEK_TEXT, SEEK_LONGTEXT, VLC_TRUE );
add_string("joystick-mapping",DEFAULT_MAPPING,NULL,
MAP_TEXT,MAP_LONGTEXT, VLC_TRUE );
- set_description( _("joystick control interface") );
+ set_description( _("Joystick control interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
if( p_intf->p_sys->i_fd == -1 )
{
- msg_Warn( p_intf, "Unable to open %s for reading: %s"
+ msg_Warn( p_intf, "unable to open %s for reading: %s"
,psz_device,strerror(errno));
return -1;
}
if ( ! psz_parse)
{
- msg_Warn (p_intf,"Invalid mapping. Aborting" );
+ msg_Warn (p_intf,"invalid mapping. aborting." );
return -1;
}
if( !strlen( psz_parse ) )
{
- msg_Warn( p_intf, "Invalid mapping. Aborting" );
+ msg_Warn( p_intf, "invalid mapping, aborting." );
return -1;
}
abs(event.value - p_intf->p_sys->axes[2].i_value) > 200 )
{
p_intf->p_sys->axes[2].i_value = event.value;
- msg_Dbg( p_intf , "Updating volume" );
+ msg_Dbg( p_intf , "updating volume" );
/* This way, the volume is between 0 and 1024 */
aout_VolumeSet( p_intf, (32767-event.value)/64 );
return 0;
if( p_intf->p_sys->axes[i_axe].i_value
> p_intf->p_sys->i_threshold )
{
- msg_Dbg(p_intf,"Up for axis %i\n",i_axe);
+ msg_Dbg(p_intf,"up for axis %i\n",i_axe);
p_intf->p_sys->axes[i_axe].pf_actup(p_intf);
}
else if( p_intf->p_sys->axes[i_axe].i_value
< -p_intf->p_sys->i_threshold )
{
- msg_Dbg(p_intf,"Down for axis %i\n",i_axe);
+ msg_Dbg(p_intf,"down for axis %i\n",i_axe);
p_intf->p_sys->axes[i_axe].pf_actdown(p_intf);
}
}
else if( event.type == JS_EVENT_BUTTON)
{
- msg_Dbg(p_intf,"Button %i %s",event.number,
+ msg_Dbg(p_intf,"button %i %s",event.number,
event.value ? "pressed":"released");
if(event.number >1) return 0; /* Only trigger 2 buttons */
if(event.value == 1) /* Button pressed */
{
if(p_intf->p_sys->p_input)
{
- msg_Dbg(p_intf,"Seeking %f seconds",p_intf->p_sys->f_seconds);
+ msg_Dbg(p_intf,"seeking %f seconds",p_intf->p_sys->f_seconds);
input_Seek( p_intf->p_sys->p_input, p_intf->p_sys->f_seconds,
INPUT_SEEK_SECONDS | INPUT_SEEK_CUR);
return 0;
{
if(p_intf->p_sys->p_input)
{
- msg_Dbg(p_intf,"Seeking -%f seconds",p_intf->p_sys->f_seconds);
+ msg_Dbg(p_intf,"seeking -%f seconds",p_intf->p_sys->f_seconds);
input_Seek( p_intf->p_sys->p_input, -(p_intf->p_sys->f_seconds),
INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
return 0;
/*****************************************************************************
- * lirc.c : lirc plugin for vlc
+ * lirc.c : lirc module for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: lirc.c,v 1.9 2003/12/22 14:32:55 sam Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: lirc.c,v 1.10 2004/01/25 16:17:03 anil Exp $
*
* Author: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("infrared remote control interface") );
+ set_description( _("Infrared remote control interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* ntservice.c: Windows NT/2K/XP service interface
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: ntservice.c,v 1.4 2003/12/22 02:24:51 sam Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: ntservice.c,v 1.5 2004/01/25 16:17:03 anil Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
vlc_module_begin();
set_description( _("Windows NT/2K/XP service interface") );
- add_category_hint( N_("NT service"), NULL, VLC_TRUE );
add_bool( "ntservice-install", 0, NULL,
INSTALL_TEXT, INSTALL_LONGTEXT, VLC_TRUE );
add_bool( "ntservice-uninstall", 0, NULL,
SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS );
if( handle == NULL )
{
- msg_Err( p_intf, "Could not connect to SCM database" );
+ msg_Err( p_intf, "could not connect to SCM database" );
return VLC_EGENERIC;
}
{
if( GetLastError() != ERROR_SERVICE_EXISTS )
{
- msg_Err( p_intf, "Could not create new service: \"%s\" (%s)",
+ msg_Err( p_intf, "could not create new service: \"%s\" (%s)",
p_sys->psz_service ,psz_path );
CloseServiceHandle( handle );
return VLC_EGENERIC;
}
else
{
- msg_Warn( p_intf, "Service \"%s\" already exists",
+ msg_Warn( p_intf, "service \"%s\" already exists",
p_sys->psz_service );
}
}
else
{
- msg_Warn( p_intf, "Service successfuly created" );
+ msg_Warn( p_intf, "service successfuly created" );
}
if( service ) CloseServiceHandle( service );
SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS );
if( handle == NULL )
{
- msg_Err( p_intf, "Could not connect to SCM database" );
+ msg_Err( p_intf, "could not connect to SCM database" );
return VLC_EGENERIC;
}
SC_HANDLE service = OpenService( handle, p_sys->psz_service, DELETE );
if( service == NULL )
{
- msg_Err( p_intf, "Could not open service" );
+ msg_Err( p_intf, "could not open service" );
CloseServiceHandle( handle );
return VLC_EGENERIC;
}
/* Remove the service */
if( !DeleteService( service ) )
{
- msg_Err( p_intf, "Could not delete service \"%s\"",
+ msg_Err( p_intf, "could not delete service \"%s\"",
p_sys->psz_service );
}
else
{
- msg_Dbg( p_intf, "Service deleted successfuly" );
+ msg_Dbg( p_intf, "service deleted successfuly" );
}
CloseServiceHandle( service );
RegisterServiceCtrlHandler( p_sys->psz_service, &ServiceCtrlHandler );
if( p_sys->hStatus == (SERVICE_STATUS_HANDLE)0 )
{
- msg_Err( p_intf, "Failed to register service control handler" );
+ msg_Err( p_intf, "failed to register service control handler" );
return;
}
/*****************************************************************************
- * rc.c : remote control stdin/stdout plugin for vlc
+ * rc.c : remote control stdin/stdout module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.41 2004/01/05 13:07:02 zorglub Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: rc.c,v 1.42 2004/01/25 16:17:03 anil Exp $
*
* Author: Peter Surda <shurdeek@panorama.sth.ac.at>
*
#define POS_LONGTEXT N_("Show the current position in seconds within the stream from time to time.")
#define TTY_TEXT N_("Fake TTY")
-#define TTY_LONGTEXT N_("Force the rc plugin to use stdin as if it was a TTY.")
+#define TTY_LONGTEXT N_("Force the rc module to use stdin as if it was a TTY.")
vlc_module_begin();
add_category_hint( N_("Remote control"), NULL, VLC_TRUE );
#ifdef HAVE_ISATTY
add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE );
#endif
- set_description( _("remote control interface") );
+ set_description( _("Remote control interface") );
set_capability( "interface", 20 );
set_callbacks( Activate, NULL );
vlc_module_end();
CONSOLE_INTRO_MSG;
- printf( "remote control interface initialized, `h' for help\n" );
+ printf( "Remote control interface initialized, `h' for help\n" );
return VLC_SUCCESS;
}
case '?':
case 'h':
case 'H':
- printf("+----[ remote control commands ]\n");
+ printf("+----[ Remote control commands ]\n");
printf("| \n");
printf("| add XYZ . . . . . . . . . . add XYZ to playlist\n");
printf("| playlist . . . show items currently in playlist\n");
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "ProductName", "VLC Multimedia Plugin\0"
+ VALUE "ProductName", "VLC multimedia plugin\0"
VALUE "ProductVersion", STRINGIFY( VERSION )
VALUE "OriginalFilename", "npvlc.dll\0"
VALUE "FileVersion", STRINGIFY( VERSION )
VALUE "FileDescription", "VLC multimedia plugin Version "STRINGIFY( VERSION )"<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a>\0"
VALUE "InternalName", "npvlc\0"
VALUE "CompanyName", "VideoLAN Team\0"
- VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2003\0"
+ VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2004\0"
VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|application/x-mplayer2|video/x-ms-wmv\0"
VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|\0"
VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|VLC plugin\0"
* vlcshell.cpp: a VLC plugin for Mozilla
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.27 2003/11/20 17:48:44 gbazin Exp $
+ * $Id: vlcshell.cpp,v 1.28 2004/01/25 16:17:03 anil Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include "vlcplugin.h"
#if USE_LIBVLC
-# define WINDOW_TEXT "(no picture)"
+# define WINDOW_TEXT _("(no picture)")
#else
-# define WINDOW_TEXT "(no libvlc)"
+# define WINDOW_TEXT _("(no libvlc)")
#endif
/*****************************************************************************
#if USE_LIBVLC
snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, VLC_Version() );
#else
- snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, "(disabled)" );
+ snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, _("(disabled)") );
#endif
psz_desc[1000-1] = 0;
*((char **)value) = psz_desc;
setup (name = 'PackageName',
version = '1.0',
- description = 'This is a demo package',
+ description = 'This is a demonstration package',
ext_modules = [vlc])
static PyMethodDef VlcMethods[] = {
- {"create", vlc_create, METH_VARARGS, "Create a vlc thread."},
- {"init", vlc_init, METH_VARARGS, "Initialize a vlc thread."},
- {"addTarget", vlc_addTarget, METH_VARARGS, "Add a target in the playlist."},
- {"play", vlc_play, METH_VARARGS, "Play"},
- {"stop", vlc_stop, METH_VARARGS, "Stop"},
- {"pause", vlc_pause, METH_VARARGS, "Pause"},
+ {"create", vlc_create, METH_VARARGS, _("Create a vlc thread.")},
+ {"init", vlc_init, METH_VARARGS, _("Initialize a vlc thread.")},
+ {"addTarget", vlc_addTarget, METH_VARARGS, _("Add a target in the playlist.")},
+ {"play", vlc_play, METH_VARARGS, _("Play")},
+ {"stop", vlc_stop, METH_VARARGS, _("Stop")},
+ {"pause", vlc_pause, METH_VARARGS, _("Pause")},
{NULL, NULL, 0, NULL} /* Sentinel */
};
version = "RTSP/1.0"
ok = "200 OK"
- badRequest = "400 Bad Request"
+ badRequest = "400 Bad request"
uriNotFound = "404 Not found"
- sessionNotFound = "454 Session Not Found"
- invalidHeader = "456 Header Field Not Valid for Resource"
- internalError = "500 Internal Server Error"
- notImplemented = "501 Not Implemented"
+ sessionNotFound = "454 Session not found"
+ invalidHeader = "456 Header field not valid for resource"
+ internalError = "500 Internal server error"
+ notImplemented = "501 Not implemented"
def error(self, message, cseq):
self.wfile.write(self.version + " " + message + "\r\n" + \
return response
def pingMethod(self, msg):
- "Handle an PING request"
+ "Handle a PING request"
cseq = msg.getheader('cseq')
id = msg.getheader('Session')
if id is None:
def ntpTime():
- "return the current time in NTP decimal format"
+ "Return the current time in NTP decimal format"
return "%d" % (int(time.time()) + 2208988800L)
PORT = 1554
if len(sys.argv) == 1:
- print "usage: vlrs <playlist>\n"
+ print "Usage: vlrs <playlist>\n"
sys.exit()
cfg.playlist = PlayList()
<html>
<head>
- <title>VLC Media Player - Browser</title>
+ <title>VLC media player - Browser</title>
<vlc id="if" param1="'control' url_extract strlen"/>
<meta http-equiv="refresh" content="0;URL=/admin/browse.html?dir=<vlc id="value" param1="'dir' url_extract" />" />
<vlc id="control" param1="add"/>
</head>
<body>
- <h2><center><a href="/">VLC Media Player <vlc id="value" param1="version" /></a></center></h2>
+ <h2><center><a href="/">VLC media player <vlc id="value" param1="version" /></a></center></h2>
<hr/>
<table width="100%" border=0 cellspacing=1 cellpadding=2>
<tr>
<th align="left" bgcolor="#cccccc">Size</th>
<th align="left" bgcolor="#cccccc">Date</th>
</tr>
- <p>This page is disabled (Change _directory_ into directory to enable it but you should think about security)</p>
+ <p>This page is default disabled for security reasons (change _directory_ into directory to enable it).</p>
<vlc id="rpn" param1="'dir' url_extract" />
<vlc id="foreach" param1="file" param2="_directory_" />
<tr>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
- <title>VLC Media Player</title>
+ <title>VLC media player</title>
<style>
body {font-family:Verdana, Arial, Sans Serif; }
h2 { text-align:center; }
<vlc id="set" param1="sout" param2="string" />
</head>
<body>
- <h2><a href="/">VLC Media Player - Admin <vlc id="value" param1="version" /></a></h2>
+ <h2><a href="/">VLC media player - Admin <vlc id="value" param1="version" /></a></h2>
<div class="section-ctr">Shutdown VLC<br /> <form method="get" action=""> <input type="submit" name="control" value="shutdown" /> </form></div>
<div class="section">
<table border="1" cellspacing="0" >
<tr>
- <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th>
+ <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>Usage</th>
</tr>
<vlc id="foreach" param1="url" param2="urls" />
<vlc id="if" param1="url.stream 0 =" />
<div class="section">
<table border="1" cellspacing="0" >
<tr>
- <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th>
+ <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>Usage</th>
</tr>
<vlc id="foreach" param1="url" param2="urls" />
<vlc id="if" param1="url.stream" />
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
- <title>VLC Media Player</title>
+ <title>VLC media player</title>
<link href="/style.css" title="Default" rel="stylesheet" />
<vlc id="if" param1="url_param"/>
</head>
<body>
<h2>
- <a href="http://www.videolan.org/">VLC Media Player <vlc id="value" param1="version" /></a> (http interface)</h2>
+ <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
<div class="sectitle">Control VLC</div>
<div class="section">
<table class="add">
<tr>
- <td nowrap="nowrap">Current State: <vlc id="value" param1="stream_state" /></td>
+ <td nowrap="nowrap">Current state: <vlc id="value" param1="stream_state" /></td>
<td align="right"><a href="info.html">Information</a> <a href="admin/">Administration</a></td>
</tr>
<tr>
<tr>
<td>
<form method="get" action="">
- Current Volume: <vlc id="value" param1="volume" /> <input type="text" name="value" size="5"/><input type="hidden" name="control" value="volume"/><input type="submit" name="Set" value="Set"/>
+ Current volume level: <vlc id="value" param1="volume" /> <input type="text" name="value" size="5"/><input type="hidden" name="control" value="volume"/><input type="submit" name="Set" value="Set"/>
</form>
</td>
</tr>
<html>
<head>
- <title>VLC Media Player - Informations</title>
+ <title>VLC media player - Informations</title>
</head>
<body>
- <h2><center><a href="http://www.videolan.org/">VLC Media Player <vlc id="value" param1="version" /></a></center></h2>
+ <h2><center><a href="http://www.videolan.org/">VLC media player <vlc id="value" param1="version" /></a></center></h2>
<hr/>
<vlc id="foreach" param1="cat" param2="informations" />
<p> <vlc id="value" param1="cat.name" />