/*****************************************************************************
* npolibvlc.cpp: official Javascript APIs
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
*
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
+ * JP Dinger <jpd@m2x.nl>
*
* 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
#include "vlcplugin.h"
#include "npolibvlc.h"
+/*
+** Local helper macros and function
+*/
+#define COUNTNAMES(a,b,c) const int a::b = sizeof(a::c)/sizeof(NPUTF8 *)
+#define RETURN_ON_EXCEPTION(this,ex) \
+ do { if( libvlc_exception_raised(&ex) ) \
+ { \
+ NPN_SetException(this, libvlc_errmsg()); \
+ libvlc_exception_clear(&ex); \
+ return INVOKERESULT_GENERIC_ERROR; \
+ } } while(false)
+
/*
** implementation of libvlc root object
*/
LibvlcRootNPObject::~LibvlcRootNPObject()
{
/*
- ** when plugin is destroyed, firefox takes upon itself to destroy all 'live' script objects
- ** and ignores refcounting. Therefore we cannot safely assume that refcounting will control
- ** lifespan of objects. Hence they are only lazily created on request, so that firefox can
- ** take ownership, and are not released when plugin is being destroyed.
+ ** When the plugin is destroyed, firefox takes it upon itself to
+ ** destroy all 'live' script objects and ignores refcounting.
+ ** Therefore we cannot safely assume that refcounting will control
+ ** lifespan of objects. Hence they are only lazily created on
+ ** request, so that firefox can take ownership, and are not released
+ ** when the plugin is destroyed.
*/
if( isValid() )
{
if( audioObj ) NPN_ReleaseObject(audioObj);
if( inputObj ) NPN_ReleaseObject(inputObj);
- if( logObj ) NPN_ReleaseObject(logObj);
if( playlistObj ) NPN_ReleaseObject(playlistObj);
if( videoObj ) NPN_ReleaseObject(videoObj);
}
}
-const NPUTF8 * const LibvlcRootNPObject::propertyNames[] =
+const NPUTF8 * const LibvlcRootNPObject::propertyNames[] =
{
"audio",
"input",
- "log",
"playlist",
+ "subtitle",
"video",
"VersionInfo",
};
-
-const int LibvlcRootNPObject::propertyCount = sizeof(LibvlcRootNPObject::propertyNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcRootNPObject,propertyCount,propertyNames);
enum LibvlcRootNPObjectPropertyIds
{
ID_root_audio = 0,
ID_root_input,
- ID_root_log,
ID_root_playlist,
+ ID_root_subtitle,
ID_root_video,
ID_root_VersionInfo,
};
-RuntimeNPObject::InvokeResult LibvlcRootNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcRootNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
switch( index )
{
case ID_root_audio:
- // create child object in lazyman fashion to avoid ownership problem with firefox
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
if( ! audioObj )
- audioObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcAudioNPObject>::getClass());
+ audioObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcAudioNPObject>::getClass());
OBJECT_TO_NPVARIANT(NPN_RetainObject(audioObj), result);
return INVOKERESULT_NO_ERROR;
case ID_root_input:
- // create child object in lazyman fashion to avoid ownership problem with firefox
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
if( ! inputObj )
- inputObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcInputNPObject>::getClass());
+ inputObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcInputNPObject>::getClass());
OBJECT_TO_NPVARIANT(NPN_RetainObject(inputObj), result);
return INVOKERESULT_NO_ERROR;
- case ID_root_log:
- // create child object in lazyman fashion to avoid ownership problem with firefox
- if( ! logObj )
- logObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcLogNPObject>::getClass());
- OBJECT_TO_NPVARIANT(NPN_RetainObject(logObj), result);
- return INVOKERESULT_NO_ERROR;
case ID_root_playlist:
- // create child object in lazyman fashion to avoid ownership problem with firefox
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
if( ! playlistObj )
- playlistObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcPlaylistNPObject>::getClass());
+ playlistObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcPlaylistNPObject>::getClass());
OBJECT_TO_NPVARIANT(NPN_RetainObject(playlistObj), result);
return INVOKERESULT_NO_ERROR;
+ case ID_root_subtitle:
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
+ if( ! subtitleObj )
+ subtitleObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcSubtitleNPObject>::getClass());
+ OBJECT_TO_NPVARIANT(NPN_RetainObject(subtitleObj), result);
+ return INVOKERESULT_NO_ERROR;
case ID_root_video:
- // create child object in lazyman fashion to avoid ownership problem with firefox
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
if( ! videoObj )
- videoObj = NPN_CreateObject(_instance,RuntimeNPClass<LibvlcVideoNPObject>::getClass());
+ videoObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcVideoNPObject>::getClass());
OBJECT_TO_NPVARIANT(NPN_RetainObject(videoObj), result);
return INVOKERESULT_NO_ERROR;
case ID_root_VersionInfo:
- {
- int len = strlen(libvlc_get_version());
- NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, libvlc_get_version(), len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
+ return invokeResultString(libvlc_get_version(),result);
default:
;
}
{
"versionInfo",
};
-
-const int LibvlcRootNPObject::methodCount = sizeof(LibvlcRootNPObject::methodNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcRootNPObject,methodCount,methodNames);
enum LibvlcRootNPObjectMethodIds
{
ID_root_versionInfo,
};
-RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
+RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index,
+ const NPVariant *args, uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
switch( index )
{
case ID_root_versionInfo:
- if( argCount == 0 )
- {
- int len = strlen(libvlc_get_version());
- NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, libvlc_get_version(), len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- return INVOKERESULT_NO_SUCH_METHOD;
+ if( 0 != argCount )
+ return INVOKERESULT_NO_SUCH_METHOD;
+ return invokeResultString(libvlc_get_version(),result);
default:
;
}
** implementation of libvlc audio object
*/
-const NPUTF8 * const LibvlcAudioNPObject::propertyNames[] =
+const NPUTF8 * const LibvlcAudioNPObject::propertyNames[] =
{
"mute",
"volume",
"track",
+ "count",
"channel",
};
-
-const int LibvlcAudioNPObject::propertyCount = sizeof(LibvlcAudioNPObject::propertyNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcAudioNPObject,propertyCount,propertyNames);
enum LibvlcAudioNPObjectPropertyIds
{
ID_audio_mute,
ID_audio_volume,
ID_audio_track,
+ ID_audio_count,
ID_audio_channel,
};
-RuntimeNPObject::InvokeResult LibvlcAudioNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcAudioNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
case ID_audio_mute:
{
bool muted = libvlc_audio_get_mute(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
BOOLEAN_TO_NPVARIANT(muted, result);
return INVOKERESULT_NO_ERROR;
}
case ID_audio_volume:
{
int volume = libvlc_audio_get_volume(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(volume, result);
return INVOKERESULT_NO_ERROR;
}
case ID_audio_track:
{
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
int track = libvlc_audio_get_track(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(track, result);
return INVOKERESULT_NO_ERROR;
}
+ case ID_audio_count:
+ {
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ // get the number of audio track available
+ int i_track = libvlc_audio_get_track_count(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ // return it
+ INT32_TO_NPVARIANT(i_track, result);
+ return INVOKERESULT_NO_ERROR;
+ }
case ID_audio_channel:
{
int channel = libvlc_audio_get_channel(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(channel, result);
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_GENERIC_ERROR;
}
-RuntimeNPObject::InvokeResult LibvlcAudioNPObject::setProperty(int index, const NPVariant &value)
+RuntimeNPObject::InvokeResult
+LibvlcAudioNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
{
libvlc_audio_set_mute(p_plugin->getVLC(),
NPVARIANT_TO_BOOLEAN(value), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_INVALID_VALUE;
{
libvlc_audio_set_volume(p_plugin->getVLC(),
numberValue(value), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_INVALID_VALUE;
case ID_audio_track:
if( isNumberValue(value) )
{
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- libvlc_audio_set_track(p_md,
- numberValue(value), &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ libvlc_audio_set_track(p_md, numberValue(value), &ex);
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_INVALID_VALUE;
{
libvlc_audio_set_channel(p_plugin->getVLC(),
numberValue(value), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_INVALID_VALUE;
const NPUTF8 * const LibvlcAudioNPObject::methodNames[] =
{
"toggleMute",
+ "description",
};
-
-const int LibvlcAudioNPObject::methodCount = sizeof(LibvlcAudioNPObject::methodNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcAudioNPObject,methodCount,methodNames);
enum LibvlcAudioNPObjectMethodIds
{
ID_audio_togglemute,
+ ID_audio_description,
};
-RuntimeNPObject::InvokeResult LibvlcAudioNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcAudioNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
if( argCount == 0 )
{
libvlc_audio_toggle_mute(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ case ID_audio_description:
+ {
+ if( argCount == 1)
+ {
+ char *psz_name;
+ int i_trackID, i_limit, i;
+ libvlc_track_description_t *p_trackDesc;
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ /* get tracks description */
+ p_trackDesc = libvlc_audio_get_track_description(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ if( !p_trackDesc )
return INVOKERESULT_GENERIC_ERROR;
- }
+
+ /* get the number of track available */
+ i_limit = libvlc_audio_get_track_count(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ /* check if a number is given by the user
+ * and get the track number */
+ if( isNumberValue(args[0]) )
+ i_trackID = numberValue(args[0]);
else
+ return INVOKERESULT_INVALID_VALUE;
+
+ /* if bad number is given return invalid value */
+ if ( ( i_trackID > ( i_limit - 1 ) ) || ( i_trackID < 0 ) )
+ return INVOKERESULT_INVALID_VALUE;
+
+ /* get the good trackDesc */
+ for( i = 0 ; i < i_trackID ; i++ )
{
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
+ p_trackDesc = p_trackDesc->p_next;
}
+ psz_name = p_trackDesc->psz_name;
+
+ /* display the name of the track chosen */
+ return invokeResultString( psz_name, result );
}
return INVOKERESULT_NO_SUCH_METHOD;
+ }
default:
;
}
** implementation of libvlc input object
*/
-const NPUTF8 * const LibvlcInputNPObject::propertyNames[] =
+const NPUTF8 * const LibvlcInputNPObject::propertyNames[] =
{
"length",
"position",
"fps",
"hasVout",
};
-
-const int LibvlcInputNPObject::propertyCount = sizeof(LibvlcInputNPObject::propertyNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcInputNPObject,propertyCount,propertyNames);
enum LibvlcInputNPObjectPropertyIds
{
ID_input_hasvout,
};
-RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcInputNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
if( libvlc_exception_raised(&ex) )
{
if( index != ID_input_state )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
+ NPN_SetException(this, libvlc_errmsg());
libvlc_exception_clear(&ex);
return INVOKERESULT_GENERIC_ERROR;
}
{
/* for input state, return CLOSED rather than an exception */
INT32_TO_NPVARIANT(0, result);
+ libvlc_exception_clear(&ex);
return INVOKERESULT_NO_ERROR;
}
}
case ID_input_length:
{
double val = (double)libvlc_media_player_get_length(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
DOUBLE_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_position:
{
double val = libvlc_media_player_get_position(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
DOUBLE_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_time:
{
double val = (double)libvlc_media_player_get_time(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
DOUBLE_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_state:
{
int val = libvlc_media_player_get_state(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_rate:
{
float val = libvlc_media_player_get_rate(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
DOUBLE_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_fps:
{
double val = libvlc_media_player_get_fps(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
DOUBLE_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_input_hasvout:
{
- bool val = libvlc_media_player_has_vout(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ bool val = p_plugin->player_has_vout(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
BOOLEAN_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
default:
;
}
- libvlc_media_player_release(p_md);
}
return INVOKERESULT_GENERIC_ERROR;
}
-RuntimeNPObject::InvokeResult LibvlcInputNPObject::setProperty(int index, const NPVariant &value)
+RuntimeNPObject::InvokeResult
+LibvlcInputNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
switch( index )
{
{
if( ! NPVARIANT_IS_DOUBLE(value) )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
float val = (float)NPVARIANT_TO_DOUBLE(value);
libvlc_media_player_set_position(p_md, val, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
case ID_input_time:
val = (int64_t)NPVARIANT_TO_DOUBLE(value);
else
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
libvlc_media_player_set_time(p_md, val, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
case ID_input_rate:
val = (float)NPVARIANT_TO_DOUBLE(value);
else
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
libvlc_media_player_set_rate(p_md, val, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
default:
;
}
- libvlc_media_player_release(p_md);
}
return INVOKERESULT_GENERIC_ERROR;
}
const NPUTF8 * const LibvlcInputNPObject::methodNames[] =
{
/* no methods */
+ "none",
};
+COUNTNAMES(LibvlcInputNPObject,methodCount,methodNames);
-const int LibvlcInputNPObject::methodCount = sizeof(LibvlcInputNPObject::methodNames)/sizeof(NPUTF8 *);
-
-/*
-** implementation of libvlc message object
-*/
-
-const NPUTF8 * const LibvlcMessageNPObject::propertyNames[] =
-{
- "severity",
- "type",
- "name",
- "header",
- "message",
-};
-
-const int LibvlcMessageNPObject::propertyCount = sizeof(LibvlcMessageNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-enum LibvlcMessageNPObjectPropertyIds
+enum LibvlcInputNPObjectMethodIds
{
- ID_message_severity,
- ID_message_type,
- ID_message_name,
- ID_message_header,
- ID_message_message,
+ ID_none,
};
-RuntimeNPObject::InvokeResult LibvlcMessageNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcInputNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
switch( index )
{
- case ID_message_severity:
- {
- INT32_TO_NPVARIANT(_msg.i_severity, result);
- return INVOKERESULT_NO_ERROR;
- }
- case ID_message_type:
- {
- if( _msg.psz_type )
- {
- int len = strlen(_msg.psz_type);
- NPUTF8* retval = (NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, _msg.psz_type, len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- case ID_message_name:
- {
- if( _msg.psz_name )
- {
- int len = strlen(_msg.psz_name);
- NPUTF8* retval = (NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, _msg.psz_name, len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- case ID_message_header:
- {
- if( _msg.psz_header )
- {
- int len = strlen(_msg.psz_header);
- NPUTF8* retval = (NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, _msg.psz_header, len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- case ID_message_message:
- {
- if( _msg.psz_message )
- {
- int len = strlen(_msg.psz_message);
- NPUTF8* retval = (NPUTF8*)NPN_MemAlloc(len);
- if( retval )
- {
- memcpy(retval, _msg.psz_message, len);
- STRINGN_TO_NPVARIANT(retval, len, result);
- }
- }
- else
- {
- NULL_TO_NPVARIANT(result);
- }
- return INVOKERESULT_NO_ERROR;
- }
+ case ID_none:
+ return INVOKERESULT_NO_SUCH_METHOD;
default:
;
}
return INVOKERESULT_GENERIC_ERROR;
}
-const NPUTF8 * const LibvlcMessageNPObject::methodNames[] =
-{
- /* no methods */
-};
-
-const int LibvlcMessageNPObject::methodCount = sizeof(LibvlcMessageNPObject::methodNames)/sizeof(NPUTF8 *);
-
/*
-** implementation of libvlc message iterator object
+** implementation of libvlc playlist items object
*/
-LibvlcMessageIteratorNPObject::LibvlcMessageIteratorNPObject(NPP instance, const NPClass *aClass) :
- RuntimeNPObject(instance, aClass),
- _p_iter(NULL)
-{
- /* is plugin still running */
- if( instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
- libvlc_log_t *p_log = p_plugin->getLog();
- if( p_log )
- {
- _p_iter = libvlc_log_get_iterator(p_log, NULL);
- }
- }
-};
-
-LibvlcMessageIteratorNPObject::~LibvlcMessageIteratorNPObject()
-{
- if( _p_iter )
- libvlc_log_iterator_free(_p_iter, NULL);
-}
-
-const NPUTF8 * const LibvlcMessageIteratorNPObject::propertyNames[] =
+const NPUTF8 * const LibvlcPlaylistItemsNPObject::propertyNames[] =
{
- "hasNext",
+ "count",
};
+COUNTNAMES(LibvlcPlaylistItemsNPObject,propertyCount,propertyNames);
-const int LibvlcMessageIteratorNPObject::propertyCount = sizeof(LibvlcMessageIteratorNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-enum LibvlcMessageIteratorNPObjectPropertyIds
+enum LibvlcPlaylistItemsNPObjectPropertyIds
{
- ID_messageiterator_hasNext,
+ ID_playlistitems_count,
};
-RuntimeNPObject::InvokeResult LibvlcMessageIteratorNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcPlaylistItemsNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
switch( index )
{
- case ID_messageiterator_hasNext:
+ case ID_playlistitems_count:
{
- if( _p_iter && p_plugin->getLog() )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- BOOLEAN_TO_NPVARIANT(libvlc_log_iterator_has_next(_p_iter, &ex), result);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- else
- {
- BOOLEAN_TO_NPVARIANT(0, result);
- }
+ int val = p_plugin->playlist_count(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ INT32_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
default:
return INVOKERESULT_GENERIC_ERROR;
}
-const NPUTF8 * const LibvlcMessageIteratorNPObject::methodNames[] =
+const NPUTF8 * const LibvlcPlaylistItemsNPObject::methodNames[] =
{
- "next",
+ "clear",
+ "remove",
};
+COUNTNAMES(LibvlcPlaylistItemsNPObject,methodCount,methodNames);
-const int LibvlcMessageIteratorNPObject::methodCount = sizeof(LibvlcMessageIteratorNPObject::methodNames)/sizeof(NPUTF8 *);
-
-enum LibvlcMessageIteratorNPObjectMethodIds
+enum LibvlcPlaylistItemsNPObjectMethodIds
{
- ID_messageiterator_next,
+ ID_playlistitems_clear,
+ ID_playlistitems_remove,
};
-RuntimeNPObject::InvokeResult LibvlcMessageIteratorNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcPlaylistItemsNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
switch( index )
{
- case ID_messageiterator_next:
+ case ID_playlistitems_clear:
if( argCount == 0 )
{
- if( _p_iter && p_plugin->getLog() )
- {
- struct libvlc_log_message_t buffer;
-
- buffer.sizeof_msg = sizeof(buffer);
-
- libvlc_log_iterator_next(_p_iter, &buffer, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- LibvlcMessageNPObject* message =
- static_cast<LibvlcMessageNPObject*>(NPN_CreateObject(_instance, RuntimeNPClass<LibvlcMessageNPObject>::getClass()));
- if( message )
- {
- message->setMessage(buffer);
- OBJECT_TO_NPVARIANT(message, result);
- return INVOKERESULT_NO_ERROR;
- }
- return INVOKERESULT_OUT_OF_MEMORY;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
+ p_plugin->playlist_clear(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ case ID_playlistitems_remove:
+ if( (argCount == 1) && isNumberValue(args[0]) )
+ {
+ p_plugin->playlist_delete_item(numberValue(args[0]),&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
default:
}
return INVOKERESULT_GENERIC_ERROR;
}
-
+
/*
-** implementation of libvlc message object
+** implementation of libvlc playlist object
*/
-const NPUTF8 * const LibvlcMessagesNPObject::propertyNames[] =
+LibvlcPlaylistNPObject::~LibvlcPlaylistNPObject()
{
- "count",
+ // Why the isValid()?
+ if( isValid() && playlistItemsObj )
+ NPN_ReleaseObject(playlistItemsObj);
};
-const int LibvlcMessagesNPObject::propertyCount = sizeof(LibvlcMessagesNPObject::propertyNames)/sizeof(NPUTF8 *);
+const NPUTF8 * const LibvlcPlaylistNPObject::propertyNames[] =
+{
+ "itemCount", /* deprecated */
+ "isPlaying",
+ "items",
+};
+COUNTNAMES(LibvlcPlaylistNPObject,propertyCount,propertyNames);
-enum LibvlcMessagesNPObjectPropertyIds
+enum LibvlcPlaylistNPObjectPropertyIds
{
- ID_messages_count,
+ ID_playlist_itemcount,
+ ID_playlist_isplaying,
+ ID_playlist_items,
};
-RuntimeNPObject::InvokeResult LibvlcMessagesNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcPlaylistNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
switch( index )
{
- case ID_messages_count:
+ case ID_playlist_itemcount: /* deprecated */
{
- libvlc_log_t *p_log = p_plugin->getLog();
- if( p_log )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- INT32_TO_NPVARIANT(libvlc_log_count(p_log, &ex), result);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- else
- {
- INT32_TO_NPVARIANT(0, result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-const NPUTF8 * const LibvlcMessagesNPObject::methodNames[] =
-{
- "clear",
- "iterator",
-};
-
-const int LibvlcMessagesNPObject::methodCount = sizeof(LibvlcMessagesNPObject::methodNames)/sizeof(NPUTF8 *);
-
-enum LibvlcMessagesNPObjectMethodIds
-{
- ID_messages_clear,
- ID_messages_iterator,
-};
-
-RuntimeNPObject::InvokeResult LibvlcMessagesNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_messages_clear:
- if( argCount == 0 )
- {
- libvlc_log_t *p_log = p_plugin->getLog();
- if( p_log )
- {
- libvlc_log_clear(p_log, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- return INVOKERESULT_NO_ERROR;
- }
- return INVOKERESULT_NO_SUCH_METHOD;
-
- case ID_messages_iterator:
- if( argCount == 0 )
- {
- LibvlcMessageIteratorNPObject* iter =
- static_cast<LibvlcMessageIteratorNPObject*>(NPN_CreateObject(_instance, RuntimeNPClass<LibvlcMessageIteratorNPObject>::getClass()));
- if( iter )
- {
- OBJECT_TO_NPVARIANT(iter, result);
- return INVOKERESULT_NO_ERROR;
- }
- return INVOKERESULT_OUT_OF_MEMORY;
- }
- return INVOKERESULT_NO_SUCH_METHOD;
-
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-
-/*
-** implementation of libvlc message object
-*/
-
-
-LibvlcLogNPObject::~LibvlcLogNPObject()
-{
- if( isValid() )
- {
- if( messagesObj ) NPN_ReleaseObject(messagesObj);
- }
-};
-
-const NPUTF8 * const LibvlcLogNPObject::propertyNames[] =
-{
- "messages",
- "verbosity",
-};
-
-const int LibvlcLogNPObject::propertyCount = sizeof(LibvlcLogNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-enum LibvlcLogNPObjectPropertyIds
-{
- ID_log_messages,
- ID_log_verbosity,
-};
-
-RuntimeNPObject::InvokeResult LibvlcLogNPObject::getProperty(int index, NPVariant &result)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_log_messages:
- {
- // create child object in lazyman fashion to avoid ownership problem with firefox
- if( ! messagesObj )
- messagesObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcMessagesNPObject>::getClass());
- OBJECT_TO_NPVARIANT(NPN_RetainObject(messagesObj), result);
- return INVOKERESULT_NO_ERROR;
- }
- case ID_log_verbosity:
- {
- if( p_plugin->getLog() )
- {
- INT32_TO_NPVARIANT(libvlc_get_log_verbosity(p_plugin->getVLC(),
- &ex), result);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- else
- {
- /* log is not enabled, return -1 */
- DOUBLE_TO_NPVARIANT(-1.0, result);
- }
- return INVOKERESULT_NO_ERROR;
- }
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-RuntimeNPObject::InvokeResult LibvlcLogNPObject::setProperty(int index, const NPVariant &value)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_log_verbosity:
- if( isNumberValue(value) )
- {
- libvlc_instance_t* p_libvlc = p_plugin->getVLC();
- libvlc_log_t *p_log = p_plugin->getLog();
- int verbosity = numberValue(value);
- if( verbosity >= 0 )
- {
- if( ! p_log )
- {
- p_log = libvlc_log_open(p_libvlc, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- p_plugin->setLog(p_log);
- }
- libvlc_set_log_verbosity(p_libvlc, (unsigned)verbosity, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- else if( p_log )
- {
- /* close log when verbosity is set to -1 */
- p_plugin->setLog(NULL);
- libvlc_log_close(p_log, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- }
- return INVOKERESULT_NO_ERROR;
- }
- return INVOKERESULT_INVALID_VALUE;
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-const NPUTF8 * const LibvlcLogNPObject::methodNames[] =
-{
- /* no methods */
-};
-
-const int LibvlcLogNPObject::methodCount = sizeof(LibvlcLogNPObject::methodNames)/sizeof(NPUTF8 *);
-
-/*
-** implementation of libvlc playlist items object
-*/
-
-const NPUTF8 * const LibvlcPlaylistItemsNPObject::propertyNames[] =
-{
- "count",
-};
-
-const int LibvlcPlaylistItemsNPObject::propertyCount = sizeof(LibvlcPlaylistItemsNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-enum LibvlcPlaylistItemsNPObjectPropertyIds
-{
- ID_playlistitems_count,
-};
-
-RuntimeNPObject::InvokeResult LibvlcPlaylistItemsNPObject::getProperty(int index, NPVariant &result)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_playlistitems_count:
- {
- libvlc_playlist_lock(p_plugin->getVLC());
- int val = libvlc_playlist_items_count(p_plugin->getVLC(), &ex);
- libvlc_playlist_unlock(p_plugin->getVLC());
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- INT32_TO_NPVARIANT(val, result);
- return INVOKERESULT_NO_ERROR;
- }
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-const NPUTF8 * const LibvlcPlaylistItemsNPObject::methodNames[] =
-{
- "clear",
- "remove",
-};
-
-const int LibvlcPlaylistItemsNPObject::methodCount = sizeof(LibvlcPlaylistItemsNPObject::methodNames)/sizeof(NPUTF8 *);
-
-enum LibvlcPlaylistItemsNPObjectMethodIds
-{
- ID_playlistitems_clear,
- ID_playlistitems_remove,
-};
-
-RuntimeNPObject::InvokeResult LibvlcPlaylistItemsNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_playlistitems_clear:
- if( argCount == 0 )
- {
- libvlc_playlist_clear(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
- }
- return INVOKERESULT_NO_SUCH_METHOD;
- case ID_playlistitems_remove:
- if( (argCount == 1) && isNumberValue(args[0]) )
- {
- libvlc_playlist_delete_item(p_plugin->getVLC(), numberValue(args[0]), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
- }
- return INVOKERESULT_NO_SUCH_METHOD;
- default:
- ;
- }
- }
- return INVOKERESULT_GENERIC_ERROR;
-}
-
-/*
-** implementation of libvlc playlist object
-*/
-
-
-LibvlcPlaylistNPObject::~LibvlcPlaylistNPObject()
-{
- if( isValid() )
- {
- if( playlistItemsObj ) NPN_ReleaseObject(playlistItemsObj);
- }
-};
-
-const NPUTF8 * const LibvlcPlaylistNPObject::propertyNames[] =
-{
- "itemCount", /* deprecated */
- "isPlaying",
- "items",
-};
-
-const int LibvlcPlaylistNPObject::propertyCount = sizeof(LibvlcPlaylistNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-enum LibvlcPlaylistNPObjectPropertyIds
-{
- ID_playlist_itemcount,
- ID_playlist_isplaying,
- ID_playlist_items,
-};
-
-RuntimeNPObject::InvokeResult LibvlcPlaylistNPObject::getProperty(int index, NPVariant &result)
-{
- /* is plugin still running */
- if( _instance->pdata )
- {
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- switch( index )
- {
- case ID_playlist_itemcount: /* deprecated */
- {
- libvlc_playlist_lock(p_plugin->getVLC());
- int val = libvlc_playlist_items_count(p_plugin->getVLC(), &ex);
- libvlc_playlist_unlock(p_plugin->getVLC());
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ int val = p_plugin->playlist_count(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_playlist_isplaying:
{
- int val = libvlc_playlist_isplaying(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ int val = p_plugin->playlist_isplaying(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
BOOLEAN_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_playlist_items:
{
- // create child object in lazyman fashion to avoid ownership problem with firefox
+ // create child object in lazyman fashion to avoid
+ // ownership problem with firefox
if( ! playlistItemsObj )
- playlistItemsObj = NPN_CreateObject(_instance, RuntimeNPClass<LibvlcPlaylistItemsNPObject>::getClass());
+ playlistItemsObj =
+ NPN_CreateObject(_instance, RuntimeNPClass<
+ LibvlcPlaylistItemsNPObject>::getClass());
OBJECT_TO_NPVARIANT(NPN_RetainObject(playlistItemsObj), result);
return INVOKERESULT_NO_ERROR;
}
"clear", /* deprecated */
"removeItem", /* deprecated */
};
-
-const int LibvlcPlaylistNPObject::methodCount = sizeof(LibvlcPlaylistNPObject::methodNames)/sizeof(NPUTF8 *);
+COUNTNAMES(LibvlcPlaylistNPObject,methodCount,methodNames);
enum LibvlcPlaylistNPObjectMethodIds
{
ID_playlist_removeitem
};
-RuntimeNPObject::InvokeResult LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
switch( index )
{
+ // XXX FIXME this needs squashing into something much smaller
case ID_playlist_add:
{
if( (argCount < 1) || (argCount > 3) )
return INVOKERESULT_NO_SUCH_METHOD;
-
- char *url = NULL;
+ if( !NPVARIANT_IS_STRING(args[0]) )
+ return INVOKERESULT_NO_SUCH_METHOD;
// grab URL
- if( NPVARIANT_IS_STRING(args[0]) )
- {
- char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
- if( s )
- {
- url = p_plugin->getAbsoluteURL(s);
- if( url )
- free(s);
- else
- // problem with combining url, use argument
- url = s;
- }
- else
- return INVOKERESULT_OUT_OF_MEMORY;
- }
- else
+ if( NPVARIANT_IS_NULL(args[0]) )
return INVOKERESULT_NO_SUCH_METHOD;
+ char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
+ if( !s )
+ return INVOKERESULT_OUT_OF_MEMORY;
+
+ char *url = p_plugin->getAbsoluteURL(s);
+ if( url )
+ free(s);
+ else
+ // problem with combining url, use argument
+ url = s;
+
char *name = NULL;
// grab name if available
}
else
{
- free(url);
+ free(url);
return INVOKERESULT_INVALID_VALUE;
}
}
}
else if( NPVARIANT_IS_STRING(args[2]) )
{
- parseOptions(NPVARIANT_TO_STRING(args[2]), &i_options, &ppsz_options);
+ parseOptions(NPVARIANT_TO_STRING(args[2]),
+ &i_options, &ppsz_options);
}
else if( NPVARIANT_IS_OBJECT(args[2]) )
{
- parseOptions(NPVARIANT_TO_OBJECT(args[2]), &i_options, &ppsz_options);
+ parseOptions(NPVARIANT_TO_OBJECT(args[2]),
+ &i_options, &ppsz_options);
}
else
{
- free(url);
+ free(url);
free(name);
return INVOKERESULT_INVALID_VALUE;
}
}
- int item = libvlc_playlist_add_extended_untrusted(p_plugin->getVLC(),
- url,
- name,
- i_options,
- const_cast<const char **>(ppsz_options),
- &ex);
+ int item = p_plugin->playlist_add_extended_untrusted(url, name,
+ i_options, const_cast<const char **>(ppsz_options), &ex);
free(url);
free(name);
for( int i=0; i< i_options; ++i )
{
- free(ppsz_options[i]);
+ free(ppsz_options[i]);
}
free(ppsz_options);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- INT32_TO_NPVARIANT(item, result);
- return INVOKERESULT_NO_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
+ INT32_TO_NPVARIANT(item, result);
+ return INVOKERESULT_NO_ERROR;
}
case ID_playlist_play:
if( argCount == 0 )
{
- libvlc_playlist_play(p_plugin->getVLC(), -1, 0, NULL, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_play(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_playItem:
if( (argCount == 1) && isNumberValue(args[0]) )
{
- libvlc_playlist_play(p_plugin->getVLC(), numberValue(args[0]), 0, NULL, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_play_item(numberValue(args[0]),&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_togglepause:
if( argCount == 0 )
{
- libvlc_playlist_pause(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_pause(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_stop:
if( argCount == 0 )
{
- libvlc_playlist_stop(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_stop(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_next:
if( argCount == 0 )
{
- libvlc_playlist_next(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_next(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_prev:
if( argCount == 0 )
{
- libvlc_playlist_prev(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_prev(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_clear: /* deprecated */
if( argCount == 0 )
{
- libvlc_playlist_clear(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_clear(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
case ID_playlist_removeitem: /* deprecated */
if( (argCount == 1) && isNumberValue(args[0]) )
{
- libvlc_playlist_delete_item(p_plugin->getVLC(), numberValue(args[0]), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
- else
- {
- VOID_TO_NPVARIANT(result);
- return INVOKERESULT_NO_ERROR;
- }
+ p_plugin->playlist_delete_item(numberValue(args[0]), &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
default:
return INVOKERESULT_GENERIC_ERROR;
}
-void LibvlcPlaylistNPObject::parseOptions(const NPString &nps, int *i_options, char*** ppsz_options)
+// XXX FIXME The new playlist_add creates a media instance and feeds it
+// XXX FIXME these options one at a time, so this hunk of code does lots
+// XXX FIXME of unnecessairy work. Break out something that can do one
+// XXX FIXME option at a time and doesn't need to realloc().
+// XXX FIXME Same for the other version of parseOptions.
+
+void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
+ int *i_options, char*** ppsz_options)
{
if( nps.utf8length )
{
if( nOptions == capacity )
{
capacity += 16;
- char **moreOptions = (char **)realloc(options, capacity*sizeof(char*));
+ char **moreOptions = (char **)realloc(options, capacity*sizeof(char*));
if( ! moreOptions )
{
/* failed to allocate more memory */
- free(s);
+ free(s);
/* return what we got so far */
*i_options = nOptions;
*ppsz_options = options;
}
}
-void LibvlcPlaylistNPObject::parseOptions(NPObject *obj, int *i_options, char*** ppsz_options)
+// XXX FIXME See comment at the other parseOptions variant.
+void LibvlcPlaylistNPObject::parseOptions(NPObject *obj, int *i_options,
+ char*** ppsz_options)
{
/* WARNING: Safari does not implement NPN_HasProperty/NPN_HasMethod */
if( count )
{
- long capacity = 16;
- char **options = (char **)malloc(capacity*sizeof(char *));
- if( options )
+ long capacity = 16;
+ char **options = (char **)malloc(capacity*sizeof(char *));
+ if( options )
+ {
+ int nOptions = 0;
+
+ while( nOptions < count )
+ {
+ propId = NPN_GetIntIdentifier(nOptions);
+ if( ! NPN_GetProperty(_instance, obj, propId, &value) )
+ /* return what we got so far */
+ break;
+
+ if( ! NPVARIANT_IS_STRING(value) )
+ {
+ /* return what we got so far */
+ NPN_ReleaseVariantValue(&value);
+ break;
+ }
+
+ if( nOptions == capacity )
+ {
+ capacity += 16;
+ char **moreOptions = (char **)realloc(options, capacity*sizeof(char*));
+ if( ! moreOptions )
+ {
+ /* failed to allocate more memory */
+ NPN_ReleaseVariantValue(&value);
+ /* return what we got so far */
+ *i_options = nOptions;
+ *ppsz_options = options;
+ break;
+ }
+ options = moreOptions;
+ }
+
+ options[nOptions++] = stringValue(value);
+ NPN_ReleaseVariantValue(&value);
+ }
+ *i_options = nOptions;
+ *ppsz_options = options;
+ }
+ }
+ }
+}
+
+/*
+** implementation of libvlc subtitle object
+*/
+
+const NPUTF8 * const LibvlcSubtitleNPObject::propertyNames[] =
+{
+ "track",
+ "count",
+};
+
+enum LibvlcSubtitleNPObjectPropertyIds
+{
+ ID_subtitle_track,
+ ID_subtitle_count,
+};
+COUNTNAMES(LibvlcSubtitleNPObject,propertyCount,propertyNames);
+
+RuntimeNPObject::InvokeResult
+LibvlcSubtitleNPObject::getProperty(int index, NPVariant &result)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
+ {
+ case ID_subtitle_track:
+ {
+ /* get the current subtitle ID */
+ int i_spu = libvlc_video_get_spu(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ /* return it */
+ INT32_TO_NPVARIANT(i_spu, result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ case ID_subtitle_count:
+ {
+ /* get the number of subtitles available */
+ int i_spu = libvlc_video_get_spu_count(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ /* return it */
+ INT32_TO_NPVARIANT(i_spu, result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ }
+ }
+ return INVOKERESULT_GENERIC_ERROR;
+}
+
+RuntimeNPObject::InvokeResult
+LibvlcSubtitleNPObject::setProperty(int index, const NPVariant &value)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
+ {
+ case ID_subtitle_track:
+ {
+ if( isNumberValue(value) )
+ {
+ /* set the new subtitle track to show */
+ libvlc_video_set_spu(p_md, numberValue(value), &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ return INVOKERESULT_NO_ERROR;
+ }
+ return INVOKERESULT_INVALID_VALUE;
+ }
+ }
+ }
+ return INVOKERESULT_GENERIC_ERROR;
+}
+
+const NPUTF8 * const LibvlcSubtitleNPObject::methodNames[] =
+{
+ "description"
+};
+COUNTNAMES(LibvlcSubtitleNPObject,methodCount,methodNames);
+
+enum LibvlcSubtitleNPObjectMethodIds
+{
+ ID_subtitle_description
+};
+
+RuntimeNPObject::InvokeResult
+LibvlcSubtitleNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
+ {
+ case ID_subtitle_description:
{
- int nOptions = 0;
-
- while( nOptions < count )
+ if( argCount == 1)
{
- propId = NPN_GetIntIdentifier(nOptions);
- if( ! NPN_GetProperty(_instance, obj, propId, &value) )
- /* return what we got so far */
- break;
+ char *psz_name;
+ int i_spuID, i_limit, i;
+ libvlc_track_description_t *p_spuDesc;
- if( ! NPVARIANT_IS_STRING(value) )
- {
- /* return what we got so far */
- NPN_ReleaseVariantValue(&value);
- break;
- }
+ /* get subtitles description */
+ p_spuDesc = libvlc_video_get_spu_description(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ if( !p_spuDesc )
+ return INVOKERESULT_GENERIC_ERROR;
- if( nOptions == capacity )
+ /* get the number of subtitle available */
+ i_limit = libvlc_video_get_spu_count(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ /* check if a number is given by the user
+ * and get the subtitle number */
+ if( isNumberValue(args[0]) )
+ i_spuID = numberValue(args[0]);
+ else
+ return INVOKERESULT_INVALID_VALUE;
+
+ /* if bad number is given return invalid value */
+ if ( ( i_spuID > ( i_limit -1 ) ) || ( i_spuID < 0 ) )
+ return INVOKERESULT_INVALID_VALUE;
+
+ /* get the good spuDesc */
+ for( i = 0 ; i < i_spuID ; i++ )
{
- capacity += 16;
- char **moreOptions = (char **)realloc(options, capacity*sizeof(char*));
- if( ! moreOptions )
- {
- /* failed to allocate more memory */
- NPN_ReleaseVariantValue(&value);
- /* return what we got so far */
- *i_options = nOptions;
- *ppsz_options = options;
- break;
- }
- options = moreOptions;
+ p_spuDesc = p_spuDesc->p_next;
}
+ psz_name = p_spuDesc->psz_name;
- options[nOptions++] = stringValue(value);
+ /* return the name of the track chosen */
+ return invokeResultString(psz_name, result);
}
- *i_options = nOptions;
- *ppsz_options = options;
+ return INVOKERESULT_NO_SUCH_METHOD;
}
+ default:
+ return INVOKERESULT_NO_SUCH_METHOD;
}
}
+ return INVOKERESULT_GENERIC_ERROR;
}
/*
** implementation of libvlc video object
*/
-const NPUTF8 * const LibvlcVideoNPObject::propertyNames[] =
+const NPUTF8 * const LibvlcVideoNPObject::propertyNames[] =
{
"fullscreen",
"height",
"aspectRatio",
"subtitle",
"crop",
- "teletext"
+ "teletext",
+ "marquee"
};
enum LibvlcVideoNPObjectPropertyIds
ID_video_aspectratio,
ID_video_subtitle,
ID_video_crop,
- ID_video_teletext
+ ID_video_teletext,
+ ID_video_marquee
};
+COUNTNAMES(LibvlcVideoNPObject,propertyCount,propertyNames);
-const int LibvlcVideoNPObject::propertyCount = sizeof(LibvlcVideoNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcVideoNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
switch( index )
{
case ID_video_fullscreen:
{
- int val = libvlc_get_fullscreen(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ int val = p_plugin->get_fullscreen(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
BOOLEAN_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_video_height:
{
int val = libvlc_video_get_height(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_video_width:
{
int val = libvlc_video_get_width(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(val, result);
return INVOKERESULT_NO_ERROR;
}
case ID_video_aspectratio:
{
NPUTF8 *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
if( !psz_aspect )
return INVOKERESULT_GENERIC_ERROR;
case ID_video_subtitle:
{
int i_spu = libvlc_video_get_spu(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(i_spu, result);
return INVOKERESULT_NO_ERROR;
}
case ID_video_crop:
{
NPUTF8 *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
if( !psz_geometry )
return INVOKERESULT_GENERIC_ERROR;
case ID_video_teletext:
{
int i_page = libvlc_video_get_teletext(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ RETURN_ON_EXCEPTION(this,ex);
INT32_TO_NPVARIANT(i_page, result);
return INVOKERESULT_NO_ERROR;
}
+ case ID_video_marquee:
+ {
+ if( ! marqueeObj )
+ marqueeObj = NPN_CreateObject(_instance,
+ RuntimeNPClass<LibvlcMarqueeNPObject>::getClass());
+ OBJECT_TO_NPVARIANT(NPN_RetainObject(marqueeObj), result);
+ return INVOKERESULT_NO_ERROR;
+ }
}
- libvlc_media_player_release(p_md);
}
return INVOKERESULT_GENERIC_ERROR;
}
-RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const NPVariant &value)
+RuntimeNPObject::InvokeResult
+LibvlcVideoNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
switch( index )
{
{
if( ! NPVARIANT_IS_BOOLEAN(value) )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
int val = NPVARIANT_TO_BOOLEAN(value);
- libvlc_set_fullscreen(p_md, val, &ex);
- libvlc_media_player_release(p_md);
-
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ p_plugin->set_fullscreen(val, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
case ID_video_aspectratio:
if( ! NPVARIANT_IS_STRING(value) )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
psz_aspect = stringValue(NPVARIANT_TO_STRING(value));
if( !psz_aspect )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_GENERIC_ERROR;
}
libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);
free(psz_aspect);
- libvlc_media_player_release(p_md);
+ RETURN_ON_EXCEPTION(this,ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
return INVOKERESULT_NO_ERROR;
}
case ID_video_subtitle:
{
if( isNumberValue(value) )
{
- libvlc_video_set_spu(p_md,
- numberValue(value), &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_video_set_spu(p_md, numberValue(value), &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
return INVOKERESULT_NO_ERROR;
}
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
case ID_video_crop:
if( ! NPVARIANT_IS_STRING(value) )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
psz_geometry = stringValue(NPVARIANT_TO_STRING(value));
if( !psz_geometry )
{
- libvlc_media_player_release(p_md);
return INVOKERESULT_GENERIC_ERROR;
}
libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);
free(psz_geometry);
- libvlc_media_player_release(p_md);
+ RETURN_ON_EXCEPTION(this,ex);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
return INVOKERESULT_NO_ERROR;
}
case ID_video_teletext:
{
if( isNumberValue(value) )
{
- libvlc_video_set_teletext(p_md,
- numberValue(value), &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
- }
+ libvlc_video_set_teletext(p_md, numberValue(value), &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
return INVOKERESULT_NO_ERROR;
}
- libvlc_media_player_release(p_md);
return INVOKERESULT_INVALID_VALUE;
}
}
- libvlc_media_player_release(p_md);
}
return INVOKERESULT_GENERIC_ERROR;
}
const NPUTF8 * const LibvlcVideoNPObject::methodNames[] =
{
"toggleFullscreen",
- "toggleTeletext"
+ "toggleTeletext",
+ "deinterlaceEnable",
+ "deinterlaceDisable"
};
+COUNTNAMES(LibvlcVideoNPObject,methodCount,methodNames);
enum LibvlcVideoNPObjectMethodIds
{
ID_video_togglefullscreen,
- ID_video_toggleteletext
+ ID_video_toggleteletext,
+ ID_video_deinterlaceenable,
+ ID_video_deinterlacedisable
+};
+
+RuntimeNPObject::InvokeResult
+LibvlcVideoNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
+ {
+ case ID_video_togglefullscreen:
+ {
+ if( argCount == 0 )
+ {
+ p_plugin->toggle_fullscreen(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_video_toggleteletext:
+ {
+ if( argCount == 0 )
+ {
+ libvlc_toggle_teletext(p_md, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ VOID_TO_NPVARIANT(result);
+ return INVOKERESULT_NO_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_video_deinterlacedisable:
+ {
+ libvlc_video_set_deinterlace(p_md, 0, "", &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ case ID_video_deinterlaceenable:
+ {
+ if(argCount == 1)
+ {
+ if( NPVARIANT_IS_STRING( args[0] ) )
+ {
+ /* get deinterlace mode from the user */
+ char *psz_mode = stringValue( NPVARIANT_TO_STRING( args[0] ) );
+ /* enable deinterlace filter if possible */
+ libvlc_video_set_deinterlace(p_md, 1, psz_mode, &ex);
+ free(psz_mode);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ else
+ {
+ return INVOKERESULT_INVALID_VALUE;
+ }
+ }
+ }
+ default:
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ }
+ return INVOKERESULT_GENERIC_ERROR;
+}
+
+/*
+** implementation of libvlc marquee object
+*/
+
+const NPUTF8 * const LibvlcMarqueeNPObject::propertyNames[] =
+{
};
-const int LibvlcVideoNPObject::methodCount = sizeof(LibvlcVideoNPObject::methodNames)/sizeof(NPUTF8 *);
+enum LibvlcMarqueeNPObjectPropertyIds
+{
+};
+COUNTNAMES(LibvlcMarqueeNPObject,propertyCount,propertyNames);
-RuntimeNPObject::InvokeResult LibvlcVideoNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
+RuntimeNPObject::InvokeResult
+LibvlcMarqueeNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
- if( _instance->pdata )
+ if( isPluginRunning() )
{
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
- if( libvlc_exception_raised(&ex) )
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return INVOKERESULT_GENERIC_ERROR;
}
+ }
+ return INVOKERESULT_GENERIC_ERROR;
+}
+
+RuntimeNPObject::InvokeResult
+LibvlcMarqueeNPObject::setProperty(int index, const NPVariant &value)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
switch( index )
{
- case ID_video_togglefullscreen:
- if( argCount == 0 )
+ }
+ }
+ return INVOKERESULT_GENERIC_ERROR;
+}
+
+const NPUTF8 * const LibvlcMarqueeNPObject::methodNames[] =
+{
+ "enable",
+ "disable",
+ "color",
+ "opacity",
+ "position",
+ "refresh",
+ "size",
+ "text",
+ "timeout",
+ "x",
+ "y"
+};
+COUNTNAMES(LibvlcMarqueeNPObject,methodCount,methodNames);
+
+enum LibvlcMarqueeNPObjectMethodIds
+{
+ ID_marquee_enable,
+ ID_marquee_disable,
+ ID_marquee_color,
+ ID_marquee_opacity,
+ ID_marquee_position,
+ ID_marquee_refresh,
+ ID_marquee_size,
+ ID_marquee_text,
+ ID_marquee_timeout,
+ ID_marquee_x,
+ ID_marquee_y
+};
+
+RuntimeNPObject::InvokeResult
+LibvlcMarqueeNPObject::invoke(int index, const NPVariant *args,
+ uint32_t argCount, NPVariant &result)
+{
+ /* is plugin still running */
+ if( isPluginRunning() )
+ {
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
+ RETURN_ON_EXCEPTION(this,ex);
+
+ switch( index )
+ {
+ case ID_marquee_enable:
+ {
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Enabled, true, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ case ID_marquee_disable:
+ {
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Enabled, false, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ case ID_marquee_color:
+ {
+ if( argCount == 1)
+ {
+ if( NPVARIANT_IS_INT32( args[0] ) )
+ {
+ int i_color = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Color, i_color, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ else
+ return INVOKERESULT_GENERIC_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_opacity:
+ {
+ if( argCount == 1)
{
- libvlc_toggle_fullscreen(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
+ if( NPVARIANT_IS_INT32( args[0] ) )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
+ int i_opacity = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Opacity, i_opacity, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
+ }
+ else
return INVOKERESULT_GENERIC_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_position:
+ {
+ if( argCount == 1)
+ {
+ if( NPVARIANT_IS_INT32( args[0] ) )
+ {
+ int i_position = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Position, i_position, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
}
else
+ return INVOKERESULT_GENERIC_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_refresh:
+ {
+ if( argCount == 1)
+ {
+ if( NPVARIANT_IS_INT32( args[0] ) )
{
- VOID_TO_NPVARIANT(result);
+ int i_refresh = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Refresh, i_refresh, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
+ else
+ return INVOKERESULT_GENERIC_ERROR;
}
- else
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_size:
+ {
+ if( argCount == 1)
{
- /* cannot get md, probably not playing */
- if( libvlc_exception_raised(&ex) )
+ if( NPVARIANT_IS_INT32( args[0] ) )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
+ int i_size = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Size, i_size, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
}
- return INVOKERESULT_GENERIC_ERROR;
+ else
+ return INVOKERESULT_GENERIC_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
- case ID_video_toggleteletext:
- if( argCount == 0 )
+ }
+ case ID_marquee_text:
+ {
+ if( argCount == 1)
{
- libvlc_toggle_teletext(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
+ if( NPVARIANT_IS_STRING( args[0] ) )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
+ char *psz_text = stringValue( NPVARIANT_TO_STRING( args[0] ) );
+ libvlc_video_set_marquee_option_as_string(p_md, libvlc_marquee_Text, psz_text, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ free(psz_text);
+ return INVOKERESULT_NO_ERROR;
+ }
+ else
return INVOKERESULT_GENERIC_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_timeout:
+ {
+ if( argCount == 1)
+ {
+ if( NPVARIANT_IS_INT32( args[0] ) )
+ {
+ int i_timeout = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Timeout, i_timeout, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
}
else
+ return INVOKERESULT_GENERIC_ERROR;
+ }
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_x:
+ {
+ if( argCount == 1)
+ {
+ if( NPVARIANT_IS_INT32( args[0] ) )
{
- VOID_TO_NPVARIANT(result);
+ int i_x = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_X, i_x, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
}
+ else
+ return INVOKERESULT_GENERIC_ERROR;
}
- else
+ return INVOKERESULT_NO_SUCH_METHOD;
+ }
+ case ID_marquee_y:
+ {
+ if( argCount == 1)
{
- /* cannot get md, probably not playing */
- if( libvlc_exception_raised(&ex) )
+ if( NPVARIANT_IS_INT32( args[0] ) )
{
- NPN_SetException(this, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
+ int i_y = NPVARIANT_TO_INT32( args[0] );
+ libvlc_video_set_marquee_option_as_int(p_md, libvlc_marquee_Y, i_y, &ex);
+ RETURN_ON_EXCEPTION(this,ex);
+ return INVOKERESULT_NO_ERROR;
}
- return INVOKERESULT_GENERIC_ERROR;
+ else
+ return INVOKERESULT_GENERIC_ERROR;
}
return INVOKERESULT_NO_SUCH_METHOD;
+ }
default:
return INVOKERESULT_NO_SUCH_METHOD;
}
}
return INVOKERESULT_GENERIC_ERROR;
}
-
projects / vlc / blobdiff