Changeset 2dfa55bd53357dc8bfcb6c94ec9a204dc9d3fe65

Timestamp:

20/12/06 23:11:54 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1166652714 +0000

git-parent:

[b2009aee6f2c6892c3c48bd85a147ae1c1ba8ac0]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1166652714 +0000

Message:

Audio track and channel support for JavaScript? API. The ActiveX vlc.audio.channel interface still has a bug left.

Files:

• activex/axvlc.idl (modified) (1 diff)
• activex/vlccontrol2.cpp (modified) (6 diffs)
• include/vlc/libvlc.h (modified) (2 diffs)
• mozilla/control/npolibvlc.cpp (modified) (13 diffs)
• mozilla/control/npolibvlc.h (modified) (3 diffs)
• src/control/audio.c (modified) (6 diffs)
• src/control/video.c (modified) (2 diffs)

activex/axvlc.idl

@@ -206 +206 @@
-        HRESULT track([in] long track);
-
-
+ stereo
-        HRESULT channel([out, retval] BSTR* channel);
-
+ stereo
-        HRESULT channel([in] BSTR channel);
-    };

activex/vlccontrol2.cpp

@@ -212 +212 @@
-        libvlc_exception_init(&ex);
-
-
+
+
+
-        if( libvlc_exception_raised(&ex) )
-        {
@@ -233 +235 @@
-        libvlc_exception_init(&ex);
-
-
+
+
+
-        if( libvlc_exception_raised(&ex) )
-        {
@@ -266 +270 @@
-            *channel = BSTRFromCStr(CP_UTF8, psz_channel);
-            free( psz_channel );
-
+
+
-        }
-        if( psz_channel ) free( psz_channel );
+        psz_channel = NULL;
-        _p_instance->setErrorInfo(IID_IVLCAudio,
-                    libvlc_exception_get_message(&ex));
@@ -298 +304 @@
-
-        libvlc_audio_set_channel(p_libvlc, psz_channel, &ex);
-
-        CoTaskMemFree(psz_channel);
-        if( libvlc_exception_raised(&ex) )
@@ -2088 +2093 @@
-                    return E_OUTOFMEMORY;
-
-SysAllocStringByteLen(psz_aspect, strlen(psz_aspect)
+BSTRFromCStr(CP_UTF8, psz_aspect
-                free( psz_aspect );
-                psz_aspect = NULL;
-
+(NULL == *aspect) ? E_OUTOFMEMORY : 
-            }
-            if( psz_aspect ) free( psz_aspect );
+            psz_aspect = NULL;
-        }
-        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
@@ -2467 +2473 @@
-    return E_OUTOFMEMORY;
-};
-

include/vlc/libvlc.h

@@ -493 +493 @@
-
-/**
-
- * \param p_instance libvlc
-
-
-
-stance
++ 
++  * \param p_input input
++ 
++ 
++ 
+put
-
-/**
- * Set current audio track
-stance libvlc
+put input
- * \param i_track the track (int)
- * \param p_exception an initialized exception
- * \return void
- */
-stance
+put
-
-/**
- * Get current audio channel
-libvlc
+input
- * \param p_exception an initialized exception
- * \return the audio channel (char *)
@@ -518 +518 @@
-
-/**
-track
-libvlc
+channel
+input
- * \param psz_channel the audio channel (char *)
- * \param p_exception an initialized exception

mozilla/control/npolibvlc.cpp

@@ -200 +200 @@
-        libvlc_exception_init(&ex);
-
+        libvlc_input_t *p_input = libvlc_playlist_get_input(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;
+        }
+
-        switch( index )
-        {
@@ -205 +213 @@
-            {
-                vlc_bool_t muted = libvlc_audio_get_mute(p_plugin->getVLC(), &ex);
+                libvlc_input_free(p_input);
-                if( libvlc_exception_raised(&ex) )
-                {
@@ -217 +226 @@
-            {
-                int volume = libvlc_audio_get_volume(p_plugin->getVLC(), &ex);
+                libvlc_input_free(p_input);
-                if( libvlc_exception_raised(&ex) )
-                {
@@ -228 +238 @@
-            case ID_audio_track:
-            {
-
+
+
-                if( libvlc_exception_raised(&ex) )
-                {
@@ -240 +251 @@
-            case ID_audio_channel:
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            default:
-                ;
-        }
+        libvlc_input_free(p_input);
-    }
-    return INVOKERESULT_GENERIC_ERROR;
@@ -281 +281 @@
-        libvlc_exception_init(&ex);
-
+        libvlc_input_t *p_input = libvlc_playlist_get_input(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;
+        }
+
-        switch( index )
-        {
@@ -288 +296 @@
-                    libvlc_audio_set_mute(p_plugin->getVLC(),
-                                          NPVARIANT_TO_BOOLEAN(value), &ex);
+                    libvlc_input_free(p_input);
-                    if( libvlc_exception_raised(&ex) )
-                    {
@@ -298 +307 @@
-                return INVOKERESULT_INVALID_VALUE;
-            case ID_audio_volume:
+                libvlc_input_free(p_input);
-                if( isNumberValue(value) )
-                {
@@ -314 +324 @@
-                if( isNumberValue(value) )
-                {
-plugin->getVLC()
+input
-                                           numberValue(value), &ex);
+                    libvlc_input_free(p_input);
-                    if( libvlc_exception_raised(&ex) )
-                    {
@@ -324 +335 @@
-                    return INVOKERESULT_NO_ERROR;
-                }
+                libvlc_input_free(p_input);
-                return INVOKERESULT_INVALID_VALUE;
-            case ID_audio_channel:
@@ -329 +341 @@
-                char *psz_channel = NULL;
-
+                libvlc_input_free(p_input);
-                if( ! NPVARIANT_IS_STRING(value) )
-                {
-                    return INVOKERESULT_INVALID_VALUE;
-                }
-
-                psz_channel = stringValue(NPVARIANT_TO_STRING(value));
@@ -353 +364 @@
-                ;
-        }
+        libvlc_input_free(p_input);
-    }
-    return INVOKERESULT_GENERIC_ERROR;
@@ -1901 +1913 @@
-                psz_aspect = stringValue(NPVARIANT_TO_STRING(value));
-                if( !psz_aspect )
-
+
+
+
+
-
-                libvlc_video_set_aspect_ratio(p_input, psz_aspect, &ex);

mozilla/control/npolibvlc.h

@@ -81 +81 @@
-    LibvlcInputNPObject(NPP instance, const NPClass *aClass) :
-        RuntimeNPObject(instance, aClass) {};
-
+
-    virtual ~LibvlcInputNPObject() {};
-
@@ -107 +107 @@
-    LibvlcMessageNPObject(NPP instance, const NPClass *aClass) :
-        RuntimeNPObject(instance, aClass) {};
-
+
-    virtual ~LibvlcMessageNPObject() {};
-
@@ -153 +153 @@
-    LibvlcMessagesNPObject(NPP instance, const NPClass *aClass) :
-        RuntimeNPObject(instance, aClass) {};
-
+
-    virtual ~LibvlcMessagesNPObject() {};
-

src/control/audio.c

@@ -26 +26 @@
-#include <vlc/libvlc.h>
-
+#include <vlc_input.h>
-#include <vlc_aout.h>
+
+/*
+ * Remember to release the returned input_thread_t since it is locked at
+ * the end of this function.
+ */
+static input_thread_t *GetInput( libvlc_input_t *p_input,
+                                 libvlc_exception_t *p_exception )
+{
+    input_thread_t *p_input_thread = NULL;
+
+    if( !p_input )
+    {
+        libvlc_exception_raise( p_exception, "Input is NULL" );
+        return NULL;
+    }
+
+    p_input_thread = (input_thread_t*)vlc_object_get(
+                                 p_input->p_instance->p_libvlc_int,
+                                 p_input->i_input_id );
+    if( !p_input_thread )
+    {
+        libvlc_exception_raise( p_exception, "Input does not exist" );
+        return NULL;
+    }
+
+    return p_input_thread;
+}
+
+/*
+ * Remember to release the returned aout_instance_t since it is locked at
+ * the end of this function.
+ */
+static aout_instance_t *GetAOut( libvlc_instance_t *p_instance,
+                                 libvlc_exception_t *p_exception )
+{
+    aout_instance_t * p_aout = NULL;
+
+    p_aout = vlc_object_find( p_instance->p_libvlc_int, VLC_OBJECT_AOUT, FIND_CHILD );
+    if( !p_aout )
+    {
+        libvlc_exception_raise( p_exception, "No active audio output" );
+        return NULL;
+    }
+
+    return p_aout;
+}
+
-
-/*****************************************************************************
@@ -95 +143 @@
- * libvlc_audio_get_track : Get the current audio track
- *****************************************************************************/
-stance_t *p_instance
+put_t *p_input
-                            libvlc_exception_t *p_e )
-{
+    input_thread_t *p_input_thread = GetInput( p_input, p_e );
-    int i_track = 0;
-
-
+
+
-
-    return i_track;
@@ -108 +158 @@
- * libvlc_audio_set_track : Set the current audio track
- *****************************************************************************/
-stance_t *p_instance
+put_t *p_input
-                             libvlc_exception_t *p_e )
-{
+    input_thread_t *p_input_thread = GetInput( p_input, p_e );
+    vlc_value_t val_list;
-    int i_ret = -1;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -127 +191 @@
-                                libvlc_exception_t *p_e )
-{
+    aout_instance_t *p_aout = GetAOut( p_instance, p_e );
-    char *psz_channel = NULL;
-int i_channel = 0
-
-i_channel = var_GetInteger( p_instance->p_libvlc_int, "audio-channel"
-i_channel
+vlc_value_t val
+
+var_Get( p_aout, "audio-channels", &val
+val.i_int
-    {
-        case AOUT_VAR_CHAN_RSTEREO:
-
+ stereo
-            break;
-        case AOUT_VAR_CHAN_STEREO:
@@ -152 +217 @@
-            break;
-    }
+    vlc_object_release( p_aout );
-    return psz_channel;
-}
@@ -161 +227 @@
-                               libvlc_exception_t *p_e )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
+
+
+
+
+
-        }
-    }
-
+
+
+
+

src/control/video.c

@@ -201 +201 @@
-    {
-        if ( strcmp( "No active video output", libvlc_exception_get_message( p_e ) ) == 0 )
-   
-   
-   
-   
+        
+        
+        
+        
-    }
-
@@ -222 +222 @@
-        return 0;
-    }
-
+
-    vout_Control( p_vout , VOUT_REPARENT, d);
-    vlc_object_release( p_vout );