Changeset acfc0a55ff1669dbb02dd3d796fe4727b7f6844b

Timestamp:

07/01/07 14:22:37 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[763252337dc2e33bf50f5a87108399c6ef8565b1]

git-author:

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

Message:

Reworked vlc.audio.channel API for JavaScript?. All documentation is already updated.

Files:

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

activex/axvlc.idl

@@ -207 +207 @@
-
-        [propget, helpstring("Returns audio channel: reverse stereo, stereo, left, right, dolby.")]
-BSTR
+long
-        [propput, helpstring("Sets audio channel to: reverse stereo, stereo, left, right, dolby.")]
-BSTR
+long
-    };
-

activex/vlccontrol2.cpp

@@ -249 +249 @@
-};
-
-BSTR
+long
-{
-    if( NULL == channel )
@@ -258 +258 @@
-    if( SUCCEEDED(hr) )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( libvlc_exception_raised(&ex) )
-        {

activex/vlccontrol2.h

@@ -69 +69 @@
-    STDMETHODIMP get_track(long*);
-    STDMETHODIMP put_track(long);
-BSTR
-BSTR
+long
+long
-    STDMETHODIMP toggleMute();
-

include/vlc/libvlc.h

@@ -511 +511 @@
- * \param p_instance input instance
- * \param p_exception an initialized exception
-char *
-
-char *
+int
+
+int 
-
-/**
- * Set current audio channel
- * \param p_instance input instance
-psz_channel the audio channel (char *
-
-
-char *
+i_channel the audio channel (int
+
+
+int
-
-/** @} */

mozilla/control/npolibvlc.cpp

@@ -251 +251 @@
-            case ID_audio_channel:
-            {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                return INVOKERESULT_NO_ERROR;
-            }
@@ -339 +336 @@
-            case ID_audio_channel:
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            default:

src/control/audio.c

@@ -188 +188 @@
- * libvlc_audio_get_channel : Get the current audio channel
- *****************************************************************************/
-char *
+int 
-                                libvlc_exception_t *p_e )
-{
-    aout_instance_t *p_aout = GetAOut( p_instance, p_e );
-    char *psz_channel = NULL;
-    vlc_value_t val;
-
-    var_Get( p_aout, "audio-channels", &val );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        case AOUT_VAR_CHAN_RSTEREO:
-            psz_channel = strdup("reverse stereo");
-            break;
-        case AOUT_VAR_CHAN_STEREO:
-            psz_channel = strdup("stereo");
-            break;
-        case AOUT_VAR_CHAN_LEFT:
-            psz_channel = strdup("left");
-            break;
-        case AOUT_VAR_CHAN_RIGHT:
-            psz_channel = strdup("right");
-            break;
-        case AOUT_VAR_CHAN_DOLBYS:
-            psz_channel = strdup("dolby");
-            break;
-        default:
-            psz_channel = strdup("disabled");
-            break;
-    }
-    vlc_object_release( p_aout );
-    return psz_channel;
-}
-
-/*****************************************************************************
- * libvlc_audio_set_channel : Set the current audio channel
- *****************************************************************************/
-void libvlc_audio_set_channel( libvlc_instance_t *p_instance, char *psz_channel,
-                               libvlc_exception_t *p_e )
-{
-    aout_instance_t *p_aout = GetAOut( p_instance, p_e );
-    vlc_value_t val_list, text_list;
-    int i_ret = -1, i;
-
-    i_ret = var_Change( p_aout, "audio-channels", VLC_VAR_GETCHOICES, &val_list, &text_list );
-    if( (i_ret < 0) || !psz_channel )
-    {
-        libvlc_exception_raise( p_e, "Audio channel out of range" );
-        vlc_object_release( p_aout );
-        return;
-    }
-
-    for( i = 0; i < val_list.p_list->i_count; i++ )
-    {
-        vlc_value_t val = val_list.p_list->p_values[i];
-        vlc_value_t text = text_list.p_list->p_values[i];
-
-        if( strncasecmp( psz_channel, text.psz_string, strlen(text.psz_string) ) == 0 )
-        {
-            i_ret = var_Set( p_aout, "audio-channels", val );
-            if( i_ret < 0 )
-            {
-failed setting audio range
+Failed setting audio channel
-                vlc_object_release( p_aout );
-                return;
@@ -255 +226 @@
-            vlc_object_release( p_aout );
-            return; /* Found */
-
-
-
+
+
+
+
-    vlc_object_release( p_aout );
-}
-