]> git.sesse.net Git - vlc/commitdiff
Don't use deprecated and removed API in Mozilla plugin.
authorChristophe Mutricy <xtophe@videolan.org>
Sat, 31 May 2008 22:30:27 +0000 (23:30 +0100)
committerChristophe Mutricy <xtophe@videolan.org>
Sat, 31 May 2008 22:30:59 +0000 (23:30 +0100)
projects/mozilla/Makefile.am
projects/mozilla/control/npolibvlc.cpp
projects/mozilla/control/npovlc.cpp [deleted file]
projects/mozilla/control/npovlc.h [deleted file]
projects/mozilla/vlcplugin.cpp
projects/mozilla/vlcshell.cpp

index f03bc99e7f220482fc5f1f29e7c89eb030394894..b6f0213dba48892a42c9617841156e3730387968 100644 (file)
@@ -12,8 +12,6 @@ SOURCES_mozilla_common = \
        vlcplugin.h \
        control/npolibvlc.cpp \
        control/npolibvlc.h \
-       control/npovlc.cpp \
-       control/npovlc.h \
        control/nporuntime.cpp \
        control/nporuntime.h \
        support/classinfo.h
index bf10d9c6ccce41162a5c50b1be46f7ae643b0ed8..3084d3e4f296364c35b0dcc84899e0861426ec65 100644 (file)
@@ -117,11 +117,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::getProperty(int index, NPVaria
                 return INVOKERESULT_NO_ERROR;
             case ID_root_VersionInfo:
             {
-                int len = strlen(VLC_Version());
+                int len = strlen(libvlc_get_version());
                 NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
                 if( retval )
                 {
-                    memcpy(retval, VLC_Version(), len);
+                    memcpy(retval, libvlc_get_version(), len);
                     STRINGN_TO_NPVARIANT(retval, len, result);
                 }
                 else
@@ -162,11 +162,11 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index, const NPVari
             case ID_root_versionInfo:
                 if( argCount == 0 )
                 {
-                    int len = strlen(VLC_Version());
+                    int len = strlen(libvlc_get_version());
                     NPUTF8 *retval =(NPUTF8*)NPN_MemAlloc(len);
                     if( retval )
                     {
-                        memcpy(retval, VLC_Version(), len);
+                        memcpy(retval, libvlc_get_version(), len);
                         STRINGN_TO_NPVARIANT(retval, len, result);
                     }
                     else
diff --git a/projects/mozilla/control/npovlc.cpp b/projects/mozilla/control/npovlc.cpp
deleted file mode 100644 (file)
index 6ca4265..0000000
+++ /dev/null
@@ -1,686 +0,0 @@
-/*****************************************************************************
- * npovlc.cpp: deprecated VLC 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.
- *****************************************************************************/
-
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
-#include "npovlc.h"
-#include "vlcplugin.h"
-
-/*
-** implementation of vlc root object
-*/
-
-const NPUTF8 * const VlcNPObject::propertyNames[] =
-{
-    /* no properties */
-};
-
-const int VlcNPObject::propertyCount = sizeof(VlcNPObject::propertyNames)/sizeof(NPUTF8 *);
-
-const NPUTF8 * const VlcNPObject::methodNames[] =
-{
-    "play",                 /* deprecated */
-    "pause",                /* deprecated */
-    "stop",                 /* deprecated */
-    "fullscreen",           /* deprecated */
-    "set_volume",           /* deprecated */
-    "get_volume",           /* deprecated */
-    "mute",                 /* deprecated */
-    "get_int_variable",     /* deprecated */
-    "set_int_variable",     /* deprecated */
-    "get_bool_variable",    /* deprecated */
-    "set_bool_variable",    /* deprecated */
-    "get_str_variable",     /* deprecated */
-    "set_str_variable",     /* deprecated */
-    "clear_playlist",       /* deprecated */
-    "add_item",             /* deprecated */
-    "next",                 /* deprecated */
-    "previous",             /* deprecated */
-    "isplaying",            /* deprecated */
-    "get_length",           /* deprecated */
-    "get_position",         /* deprecated */
-    "get_time",             /* deprecated */
-    "seek",                 /* deprecated */
-};
-
-enum VlcNPObjectMethodIds
-{
-    ID_play = 0,
-    ID_pause,
-    ID_stop,
-    ID_fullscreen,
-    ID_set_volume,
-    ID_get_volume,
-    ID_mute,
-    ID_get_int_variable,
-    ID_set_int_variable,
-    ID_get_bool_variable,
-    ID_set_bool_variable,
-    ID_get_str_variable,
-    ID_set_str_variable,
-    ID_clear_playlist,
-    ID_add_item,
-    ID_next,
-    ID_previous,
-    ID_isplaying,
-    ID_get_length,
-    ID_get_position,
-    ID_get_time,
-    ID_seek,
-};
-
-const int VlcNPObject::methodCount = sizeof(VlcNPObject::methodNames)/sizeof(NPUTF8 *);
-
-RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)
-{
-    VlcPlugin *p_plugin = reinterpret_cast<VlcPlugin *>(_instance->pdata);
-    if( p_plugin )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        switch( index )
-        {
-            case ID_play: /* deprecated */
-                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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_pause: /* deprecated */
-                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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_stop: /* deprecated */
-                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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_fullscreen: /* deprecated */
-                if( argCount == 0 )
-                {
-                    libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
-                    if( p_md )
-                    {
-                        libvlc_toggle_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;
-                        }
-                        else
-                        {
-                            VOID_TO_NPVARIANT(result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                    }
-                    else
-                    {
-                        /* cannot get input, probably not playing */
-                        if( libvlc_exception_raised(&ex) )
-                        {
-                            NPN_SetException(this, libvlc_exception_get_message(&ex));
-                            libvlc_exception_clear(&ex);
-                        }
-                        return INVOKERESULT_GENERIC_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_set_volume: /* deprecated */
-                if( (argCount == 1) && isNumberValue(args[0]) )
-                {
-                    libvlc_audio_set_volume(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;
-            case ID_get_volume: /* deprecated */
-                if( argCount == 0 )
-                {
-                    int val = 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;
-                    }
-                    else
-                    {
-                        INT32_TO_NPVARIANT(val, result);
-                        return INVOKERESULT_NO_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_mute: /* deprecated */
-                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 INVOKERESULT_GENERIC_ERROR;
-                    }
-                    else
-                    {
-                        VOID_TO_NPVARIANT(result);
-                        return INVOKERESULT_NO_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_int_variable: /* deprecated */
-                if( (argCount == 1) && NPVARIANT_IS_STRING(args[0]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        if( VLC_SUCCESS == VLC_VariableGet(vlc_id, s, &val) )
-                        {
-                            delete s;
-                            INT32_TO_NPVARIANT(val.i_int, result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_INVALID_ARGS;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_set_int_variable: /* deprecated */
-                if( (argCount == 2)
-                    && NPVARIANT_IS_STRING(args[0])
-                    && isNumberValue(args[1]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        val.i_int = numberValue(args[1]);
-                        if( VLC_SUCCESS == VLC_VariableSet(vlc_id, s, val) )
-                        {
-                            delete s;
-                            VOID_TO_NPVARIANT(result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_INVALID_ARGS;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_bool_variable: /* deprecated */
-                if( (argCount == 1) && NPVARIANT_IS_STRING(args[0]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        if( VLC_SUCCESS == VLC_VariableGet(vlc_id, s, &val) )
-                        {
-                            delete s;
-                            BOOLEAN_TO_NPVARIANT(val.b_bool, result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_INVALID_ARGS;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_set_bool_variable: /* deprecated */
-                if( (argCount == 2)
-                    && NPVARIANT_IS_STRING(args[0])
-                    && NPVARIANT_IS_BOOLEAN(args[1]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        val.b_bool = NPVARIANT_TO_BOOLEAN(args[1]);
-                        if( VLC_SUCCESS == VLC_VariableSet(vlc_id, s, val) )
-                        {
-                            delete s;
-                            VOID_TO_NPVARIANT(result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_INVALID_ARGS;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_str_variable: /* deprecated */
-                if( (argCount == 1) && NPVARIANT_IS_STRING(args[0]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        if( VLC_SUCCESS == VLC_VariableGet(vlc_id, s, &val) )
-                        {
-                            delete s;
-                            if( val.psz_string )
-                            {
-                                int len = strlen(val.psz_string);
-                                NPUTF8 *retval = (NPUTF8 *)NPN_MemAlloc(len);
-                                if( retval )
-                                {
-                                    memcpy(retval, val.psz_string, len);
-                                    STRINGN_TO_NPVARIANT(retval, len, result);
-                                    free(val.psz_string);
-                                    return INVOKERESULT_NO_ERROR;
-                                }
-                                else
-                                {
-                                    return INVOKERESULT_OUT_OF_MEMORY;
-                                }
-                            }
-                            else
-                            {
-                                /* null string */
-                                NULL_TO_NPVARIANT(result);
-                                return INVOKERESULT_NO_ERROR;
-                            }
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_INVALID_ARGS;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_set_str_variable: /* deprecated */
-                if( (argCount == 2)
-                    && NPVARIANT_IS_STRING(args[0])
-                    && NPVARIANT_IS_STRING(args[1]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        int vlc_id = libvlc_get_vlc_id(p_plugin->getVLC());
-                        vlc_value_t val;
-                        val.psz_string = stringValue(NPVARIANT_TO_STRING(args[1]));
-                        if( val.psz_string )
-                        {
-                            if( VLC_SUCCESS == VLC_VariableSet(vlc_id, s, val) )
-                            {
-                                delete s;
-                                delete val.psz_string;
-                                VOID_TO_NPVARIANT(result);
-                                return INVOKERESULT_NO_ERROR;
-                            }
-                            else
-                            {
-                                delete s;
-                                delete val.psz_string;
-                                return INVOKERESULT_INVALID_ARGS;
-                            }
-                        }
-                        else
-                        {
-                            delete s;
-                            return INVOKERESULT_OUT_OF_MEMORY;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_clear_playlist: /* 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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_add_item: /* deprecated */
-                if( (argCount == 1) && NPVARIANT_IS_STRING(args[0]) )
-                {
-                    char *s = stringValue(NPVARIANT_TO_STRING(args[0]));
-                    if( s )
-                    {
-                        char *url = p_plugin->getAbsoluteURL(s);
-                        delete s;
-                        if( ! url )
-                            // what happened ?
-                            return INVOKERESULT_GENERIC_ERROR;
-                             
-                        int item = libvlc_playlist_add(p_plugin->getVLC(), url, NULL, &ex);
-                        free(url);
-                        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;
-                        }
-                    }
-                    else
-                        return INVOKERESULT_OUT_OF_MEMORY;
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_next: /* deprecated */
-                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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_previous: /* deprecated */
-                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;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_isplaying: /* deprecated */
-                if( argCount == 0 )
-                {
-                    int isplaying = 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;
-                    }
-                    else
-                    {
-                        BOOLEAN_TO_NPVARIANT(isplaying, result);
-                        return INVOKERESULT_NO_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_length: /* deprecated */
-                if( argCount == 0 )
-                {
-                    libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
-                    if( p_md )
-                    {
-                        int64_t val = 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;
-                        }
-                        else
-                        {
-                            INT32_TO_NPVARIANT((uint32_t)(val/1000LL), result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                    }
-                    else
-                    {
-                        /* cannot get input, probably not playing */
-                        if( libvlc_exception_raised(&ex) )
-                        {
-                            NPN_SetException(this, libvlc_exception_get_message(&ex));
-                            libvlc_exception_clear(&ex);
-                        }
-                        return INVOKERESULT_GENERIC_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_position: /* deprecated */
-                if( argCount == 0 )
-                {
-                    libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
-                    if( p_md )
-                    {
-                        float 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;
-                        }
-                        else
-                        {
-                            DOUBLE_TO_NPVARIANT((double)val, result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                    }
-                    else
-                    {
-                        /* cannot get input, probably not playing */
-                        if( libvlc_exception_raised(&ex) )
-                        {
-                            NPN_SetException(this, libvlc_exception_get_message(&ex));
-                            libvlc_exception_clear(&ex);
-                        }
-                        return INVOKERESULT_GENERIC_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_get_time: /* deprecated */
-                if( argCount == 0 )
-                {
-                    libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
-                    if( p_md )
-                    {
-                        int64_t val = 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;
-                        }
-                        else
-                        {
-                            DOUBLE_TO_NPVARIANT((uint32_t)(val/1000LL), result);
-                            return INVOKERESULT_NO_ERROR;
-                        }
-                    }
-                    else
-                    {
-                        /* cannot get input, probably not playing */
-                        if( libvlc_exception_raised(&ex) )
-                        {
-                            NPN_SetException(this, libvlc_exception_get_message(&ex));
-                            libvlc_exception_clear(&ex);
-                        }
-                        return INVOKERESULT_GENERIC_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            case ID_seek: /* deprecated */
-                if( (argCount == 2)
-                  && isNumberValue(args[0])
-                  && NPVARIANT_IS_BOOLEAN(args[1]) )
-                {
-                    libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
-                    if( p_md )
-                    {
-                        int64_t pos = 0;
-                        if( NPVARIANT_IS_INT32(args[0]) )
-                            pos = (int64_t)NPVARIANT_TO_INT32(args[0]);
-                        else
-                            pos = (int64_t)NPVARIANT_TO_DOUBLE(args[0]);
-
-                        if( NPVARIANT_TO_BOOLEAN(args[1]) )
-                        {
-                            /* relative seek */
-                            int64_t from = libvlc_media_player_get_time(p_md, &ex);
-                            if( libvlc_exception_raised(&ex) )
-                            {
-                                libvlc_media_player_release(p_md);
-                                NPN_SetException(this, libvlc_exception_get_message(&ex));
-                                libvlc_exception_clear(&ex);
-                                return INVOKERESULT_GENERIC_ERROR;
-                            }
-                            pos += from;
-                        }
-                        /* jump to time */
-                        libvlc_media_player_set_time(p_md, pos, &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;
-                        }
-                        VOID_TO_NPVARIANT(result);
-                        return INVOKERESULT_NO_ERROR;
-                    }
-                    else
-                    {
-                        /* cannot get input, probably not playing */
-                        if( libvlc_exception_raised(&ex) )
-                        {
-                            NPN_SetException(this, libvlc_exception_get_message(&ex));
-                            libvlc_exception_clear(&ex);
-                        }
-                        return INVOKERESULT_GENERIC_ERROR;
-                    }
-                }
-                return INVOKERESULT_NO_SUCH_METHOD;
-            default:
-                return INVOKERESULT_NO_SUCH_METHOD;
-        }
-    }
-    return INVOKERESULT_GENERIC_ERROR;
-}
-
diff --git a/projects/mozilla/control/npovlc.h b/projects/mozilla/control/npovlc.h
deleted file mode 100644 (file)
index 971207d..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * 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);
-};
-
index 1d6eb91d2b824c45dba5c52a487109f8a2617000..1d4c9a0faa43828f7ca0ec7cbc44a12e482dd5e3 100644 (file)
@@ -229,16 +229,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     }
 
     /* assign plugin script root class */
-    if( (NULL != progid) && (!strcmp(progid, "VideoLAN.VLCPlugin.2")) )
-    {
-        /* new APIs */
-        p_scriptClass = RuntimeNPClass<LibvlcRootNPObject>::getClass();
-    }
-    else
-    {
-        /* legacy APIs */
-        p_scriptClass = RuntimeNPClass<VlcNPObject>::getClass();
-    }
+    /* new APIs */
+    p_scriptClass = RuntimeNPClass<LibvlcRootNPObject>::getClass();
 
     return NPERR_NO_ERROR;
 }
index 0dbc3a07356262b734fba8ec4eee8893b22ce65c..4d93ae91bf5c00f25d0441807b7de8ec18276632 100644 (file)
@@ -95,7 +95,7 @@ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
 
         case NPPVpluginDescriptionString:
             snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION,
-                      VLC_Version() );
+                      libvlc_get_version() );
             *((char **)value) = psz_desc;
             return NPERR_NO_ERROR;