Review: Removed debug leftovers that where #if'ed and reverted none exiting p_plugin->getMP() changes.
Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>
LibvlcRootNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcRootNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
const NPVariant *args, uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
const NPVariant *args, uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcAudioNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcAudioNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcAudioNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
LibvlcAudioNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
RETURN_ON_EXCEPTION(this,ex);
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
RETURN_ON_EXCEPTION(this,ex);
- libvlc_audio_set_track(p_md,
- numberValue(value), &ex);
+ libvlc_audio_set_track(p_md, numberValue(value), &ex);
libvlc_media_player_release(p_md);
RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
libvlc_media_player_release(p_md);
RETURN_ON_EXCEPTION(this,ex);
return INVOKERESULT_NO_ERROR;
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcInputNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcInputNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcInputNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
LibvlcInputNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcMessageNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcMessageNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
RuntimeNPObject(instance, aClass),
_p_iter(NULL)
{
RuntimeNPObject(instance, aClass),
_p_iter(NULL)
{
+ // XXX FIXME use _instance or instance in this method?
+
/* is plugin still running */
if( instance->pdata )
{
/* is plugin still running */
if( instance->pdata )
{
LibvlcMessageIteratorNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcMessageIteratorNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
switch( index )
{
case ID_messageiterator_hasNext:
switch( index )
{
case ID_messageiterator_hasNext:
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcMessagesNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcMessagesNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
switch( index )
{
case ID_messages_count:
switch( index )
{
case ID_messages_count:
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcLogNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcLogNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcLogNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
LibvlcLogNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcPlaylistItemsNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcPlaylistItemsNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcPlaylistNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcPlaylistNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
return INVOKERESULT_INVALID_VALUE;
}
}
return INVOKERESULT_INVALID_VALUE;
}
}
LibvlcVideoNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
LibvlcVideoNPObject::getProperty(int index, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
LibvlcVideoNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
LibvlcVideoNPObject::setProperty(int index, const NPVariant &value)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
uint32_t argCount, NPVariant &result)
{
/* is plugin still running */
+ if( isPluginRunning() )
- VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(_instance->pdata);
+ VlcPlugin* p_plugin = getPrivate<VlcPlugin>();
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
bool returnInvokeResult(InvokeResult result);
bool returnInvokeResult(InvokeResult result);
+ bool isPluginRunning()
+ {
+ return _instance->pdata;
+ }
+ template<class T> T *getPrivate()
+ {
+ return reinterpret_cast<T *>(_instance->pdata);
+ }
+