Commit 2203521d authored by Christophe Mutricy's avatar Christophe Mutricy

Don't use deprecated and removed API in Mozilla plugin.

parent 31a8cbee
...@@ -12,8 +12,6 @@ SOURCES_mozilla_common = \ ...@@ -12,8 +12,6 @@ SOURCES_mozilla_common = \
vlcplugin.h \ vlcplugin.h \
control/npolibvlc.cpp \ control/npolibvlc.cpp \
control/npolibvlc.h \ control/npolibvlc.h \
control/npovlc.cpp \
control/npovlc.h \
control/nporuntime.cpp \ control/nporuntime.cpp \
control/nporuntime.h \ control/nporuntime.h \
support/classinfo.h support/classinfo.h
......
...@@ -117,11 +117,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::getProperty(int index, NPVaria ...@@ -117,11 +117,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::getProperty(int index, NPVaria
return INVOKERESULT_NO_ERROR; return INVOKERESULT_NO_ERROR;
case ID_root_VersionInfo: case ID_root_VersionInfo:
{ {
int len = strlen(VLC_Version()); int len = strlen(libvlc_get_version());
NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len); NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
if( retval ) if( retval )
{ {
memcpy(retval, VLC_Version(), len); memcpy(retval, libvlc_get_version(), len);
STRINGN_TO_NPVARIANT(retval, len, result); STRINGN_TO_NPVARIANT(retval, len, result);
} }
else else
...@@ -162,11 +162,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index, const NPVari ...@@ -162,11 +162,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index, const NPVari
case ID_root_versionInfo: case ID_root_versionInfo:
if( argCount == 0 ) if( argCount == 0 )
{ {
int len = strlen(VLC_Version()); int len = strlen(libvlc_get_version());
NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len); NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
if( retval ) if( retval )
{ {
memcpy(retval, VLC_Version(), len); memcpy(retval, libvlc_get_version(), len);
STRINGN_TO_NPVARIANT(retval, len, result); STRINGN_TO_NPVARIANT(retval, len, result);
} }
else else
......
This diff is collapsed.
/*****************************************************************************
* npovlc.h: deprecated APIs implemented in late XPCOM interface
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
*
* Authors: Damien Fouilleul <damien.fouilleul@laposte.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*
** defined runtime script objects
*/
#include "nporuntime.h"
class VlcNPObject: public RuntimeNPObject
{
protected:
friend class RuntimeNPClass<VlcNPObject>;
VlcNPObject(NPP instance, const NPClass *aClass) :
RuntimeNPObject(instance, aClass) {};
virtual ~VlcNPObject() {};
static const int propertyCount;
static const NPUTF8 * const propertyNames[];
static const int methodCount;
static const NPUTF8 * const methodNames[];
virtual InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
};
...@@ -229,16 +229,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) ...@@ -229,16 +229,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
} }
/* assign plugin script root class */ /* assign plugin script root class */
if( (NULL != progid) && (!strcmp(progid, "VideoLAN.VLCPlugin.2")) ) /* new APIs */
{ p_scriptClass = RuntimeNPClass<LibvlcRootNPObject>::getClass();
/* new APIs */
p_scriptClass = RuntimeNPClass<LibvlcRootNPObject>::getClass();
}
else
{
/* legacy APIs */
p_scriptClass = RuntimeNPClass<VlcNPObject>::getClass();
}
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
} }
......
...@@ -95,7 +95,7 @@ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value ) ...@@ -95,7 +95,7 @@ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
case NPPVpluginDescriptionString: case NPPVpluginDescriptionString:
snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION, snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION,
VLC_Version() ); libvlc_get_version() );
*((char **)value) = psz_desc; *((char **)value) = psz_desc;
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment