Changeset ced125da0699eb348462270926a6802288800433

Timestamp:

03/02/08 17:07:53 (4 months ago)

Author:

André Weber <WeberAndre@gmx.de>

git-committer:

André Weber <WeberAndre@gmx.de> 1204474073 +0100

git-parent:

[9438646c972ab353d6cd686397f29e16174499ef]

git-author:

André Weber <WeberAndre@gmx.de> 1204474073 +0100

Message:

Revert "#492 bugfix, for SPDIF audio ouput of AC3 and DTS sound on Windows"

This reverts commit 9438646c972ab353d6cd686397f29e16174499ef.
wrong file in my list I'am sorry, and wrong file modes

Files:

• modules/audio_output/waveout.c (modified) (36 diffs, 1 prop)
• po/ca.po (modified) (639 diffs)
• share/vlc_win32_rc.rc (modified) (1 diff, 1 prop)

modules/audio_output/waveout.c

@@ -32 +32 @@
-#include <vlc/vlc.h>
-#include <vlc_aout.h>
-#include <vlc_charset.h>
-
-#include <windows.h>
@@ -122 +121 @@
-/* local functions */
-static void Probe        ( aout_instance_t * );
-
-
-
-
+
+
-static int PlayWaveOut   ( aout_instance_t *, HWAVEOUT, WAVEHDR *,
-, vlc_bool_t
+
-
-static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
@@ -135 +132 @@
-static int VolumeGet( aout_instance_t *, audio_volume_t * );
-static int VolumeSet( aout_instance_t *, audio_volume_t );
-
-static int WaveOutClearDoneBuffers(aout_sys_t *p_sys);
-
-static int ReloadWaveoutDevices( vlc_object_t *, char const *,
-                                vlc_value_t, vlc_value_t, void * );
-static uint32_t findDeviceID(char *);
-
-static const char psz_device_name_fmt[] = "%s ($%x,$%x)";
-
-static const char *ppsz_adev[] = { "wavemapper", };
-static const char *ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
-
-
-
-/*****************************************************************************
@@ -156 +140 @@
-    "The option allows you to enable or disable the high-quality float32 " \
-    "audio output mode (which is not well supported by some soundcards)." )
-#define DEVICE_TEXT N_("Select Audio Device")
-#define DEVICE_LONG N_("Select special Audio device, or let windows "\
-                       "decide (default), change needs VLC restart "\
-                       "to apply.")
-#define DEFAULT_AUDIO_DEVICE N_("Default Audio Device")
-
-vlc_module_begin();
@@ -169 +148 @@
-    set_subcategory( SUBCAT_AUDIO_AOUT );
-    add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, VLC_TRUE );
-
-    add_string( "waveout-dev", "wavemapper", NULL,
-                 DEVICE_TEXT, DEVICE_LONG, VLC_FALSE );
-       change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices );
-       change_need_restart();
-       change_action_add( ReloadWaveoutDevices, N_("Refresh list") );
-
-
-    set_callbacks( Open, Close );
-vlc_module_end();
@@ -188 +159 @@
-struct aout_sys_t
-{
-    uint32_t i_wave_device_id;               /* ID of selected output device */
-
-    HWAVEOUT h_waveout;                        /* handle to waveout instance */
-
@@ -198 +167 @@
-    notification_thread_t *p_notif;                      /* WaveOutThread id */
-    HANDLE event;
-    HANDLE new_buffer_event;
-
-    // rental from alsa.c to synchronize startup of audiothread
-    int b_playing;                                         /* playing status */
-    mtime_t start_date;
-
-    int i_repeat_counter;
-
-    int i_buffer_size;
@@ -253 +215 @@
-    p_aout->b_die = VLC_FALSE;
-
-
-    /*
-     initialize/update Device selection List
-    */
-    ReloadWaveoutDevices( p_this, "waveout-dev", val, val, NULL);
-
-
-    /*
-      check for configured audio device!
-    */
-    char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-dev");
-
-    p_aout->output.p_sys->i_wave_device_id =
-         findDeviceID( psz_waveout_dev );
-
-    if(p_aout->output.p_sys->i_wave_device_id == WAVE_MAPPER)
-    {
-       if(psz_waveout_dev &&
-          stricmp(psz_waveout_dev,"wavemapper"))
-       {
-           msg_Warn( p_aout, "configured audio device '%s' not available, "\
-                         "use default instead", psz_waveout_dev );
-       }
-    }
-    if(psz_waveout_dev) free( psz_waveout_dev );
-
-
-    WAVEOUTCAPS waveoutcaps;
-    if(waveOutGetDevCaps( p_aout->output.p_sys->i_wave_device_id,
-                          &waveoutcaps,
-                          sizeof(WAVEOUTCAPS)) == MMSYSERR_NOERROR)
-    {
-      /* log debug some infos about driver, to know who to blame
-         if it doesn't work */
-        msg_Dbg( p_aout, "Drivername: %s", waveoutcaps.szPname);
-        msg_Dbg( p_aout, "Driver Version: %d.%d",
-                          (waveoutcaps.vDriverVersion>>8)&255,
-                          waveoutcaps.vDriverVersion & 255);
-        msg_Dbg( p_aout, "Manufacturer identifier: 0x%x", waveoutcaps.wMid );
-        msg_Dbg( p_aout, "Product identifier: 0x%x", waveoutcaps.wPid );
-    }
-
-
-
-    if( var_Type( p_aout, "audio-device" ) == 0 )
-    {
@@ -305 +223 @@
-    {
-        /* Probe() has failed. */
-        var_Destroy( p_aout, "waveout-device");
-        free( p_aout->output.p_sys );
-        return VLC_EGENERIC;
-    }
-
+    var_Create( p_aout, "waveout-float32", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-    /* Open the device */
@@ -316 +234 @@
-        p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
-
-
-
-
+
-                         p_aout->output.output.i_physical_channels,
-                         aout_FormatNbChannels( &p_aout->output.output ),
@@ -365 +281 @@
-        }
-
-
-
-
+
-                            p_aout->output.output.i_physical_channels,
-                            aout_FormatNbChannels( &p_aout->output.output ),
@@ -414 +328 @@
-        return 1;
-    }
-    p_aout->output.p_sys->i_repeat_counter = 0;
-
-
-    /* Zero the buffer. WinCE doesn't have calloc(). */
@@ -426 +338 @@
-    p_aout->output.p_sys->p_notif->p_aout = p_aout;
-    p_aout->output.p_sys->event = CreateEvent( NULL, FALSE, FALSE, NULL );
-    p_aout->output.p_sys->new_buffer_event = CreateEvent( NULL, FALSE, FALSE, NULL );
-
-    /* define startpoint of playback on first call to play()
-      like alsa does (instead of playing a blank sample) */
-    p_aout->output.p_sys->b_playing = 0;
-    p_aout->output.p_sys->start_date = 0;
-
-
-    /* Then launch the notification thread */
-    if( vlc_thread_create( p_aout->output.p_sys->p_notif,
-                           "waveOut Notification Thread", WaveOutThread,
-OUTPU
+HIGHES
-    {
-        msg_Err( p_aout, "cannot create WaveOutThread" );
@@ -449 +354 @@
-        p_aout->output.p_sys->waveheader[i].dwUser = 0;
-    }
+    PlayWaveOut( p_aout, p_aout->output.p_sys->h_waveout,
+                 &p_aout->output.p_sys->waveheader[0], NULL );
-
-    return 0;
@@ -472 +379 @@
-    if( p_aout->output.output.i_physical_channels == i_physical_channels )
-    {
-
-
-
+
-                            i_physical_channels, 6,
-                            p_aout->output.output.i_rate, VLC_TRUE )
@@ -480 +385 @@
-        {
-            val.i_int = AOUT_VAR_5_1;
-(char *)
+
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -493 +398 @@
-        == i_physical_channels )
-    {
-
-
-
+
-                            i_physical_channels, 4,
-                            p_aout->output.output.i_rate, VLC_TRUE )
@@ -501 +404 @@
-        {
-            val.i_int = AOUT_VAR_2F2R;
-(char *)
+
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -510 +413 @@
-    /* Test for stereo support */
-    i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-
-
-
+
-                        i_physical_channels, 2,
-                        p_aout->output.output.i_rate, VLC_TRUE )
@@ -518 +419 @@
-    {
-        val.i_int = AOUT_VAR_STEREO;
-(char *)
+
-        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
-        msg_Dbg( p_aout, "device supports 2 channels" );
@@ -525 +426 @@
-    /* Test for mono support */
-    i_physical_channels = AOUT_CHAN_CENTER;
-
-
-
+
-                        i_physical_channels, 1,
-                        p_aout->output.output.i_rate, VLC_TRUE )
@@ -533 +432 @@
-    {
-        val.i_int = AOUT_VAR_MONO;
-(char *)
+
-        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
-        msg_Dbg( p_aout, "device supports 1 channel" );
@@ -541 +440 @@
-    if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
-    {
-
-
-
+
-                         p_aout->output.output.i_physical_channels,
-                         aout_FormatNbChannels( &p_aout->output.output ),
@@ -551 +448 @@
-            msg_Dbg( p_aout, "device supports A/52 over S/PDIF" );
-            val.i_int = AOUT_VAR_SPDIF;
-(char *)
+
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -581 +478 @@
-static void Play( aout_instance_t *_p_aout )
-{
-    if( !_p_aout->output.p_sys->b_playing )
-    {
-        _p_aout->output.p_sys->b_playing = 1;
-
-        /* get the playing date of the first aout buffer */
-        _p_aout->output.p_sys->start_date =
-            aout_FifoFirstDate( _p_aout, &_p_aout->output.fifo );
-
-        msg_Dbg( _p_aout, "Wakeup sleeping output thread.");
-
-        /* wake up the audio output thread */
-        SetEvent( _p_aout->output.p_sys->event );
-    } else {
-        SetEvent( _p_aout->output.p_sys->new_buffer_event );
-    }
-}
-
@@ -609 +491 @@
-    vlc_object_kill( p_aout );
-
-
+
+
+
-    SetEvent( p_sys->event );
-    SetEvent( p_sys->new_buffer_event );
-
-    vlc_thread_join( p_sys->p_notif );
-    vlc_object_release( p_sys->p_notif );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    if( waveOutClose( p_sys->h_waveout ) != MMSYSERR_NOERROR )
-    {
-        msg_Err( p_aout, "waveOutClose failed" );
-    }
-
-    /*
-      because so long, the waveout device is playing, the callback
-      could occur and need the events
-    */
-    CloseHandle( p_sys->event );
-    CloseHandle( p_sys->new_buffer_event);
-
-    free( p_sys->p_silence_buffer );
@@ -678 +512 @@
- * OpenWaveOut: open the waveout sound device
- ****************************************************************************/
-uint32_t i_device_id, 
+
-                        int i_channels, int i_nb_channels, int i_rate,
-                        vlc_bool_t b_probe )
@@ -745 +579 @@
-    }
-
-    if(!b_probe) {
-        msg_Dbg( p_aout, "OpenWaveDevice-ID: %u", i_device_id);
-        msg_Dbg( p_aout,"waveformat.Format.cbSize          = %d",
-                 waveformat.Format.cbSize);
-        msg_Dbg( p_aout,"waveformat.Format.wFormatTag      = %u",
-                 waveformat.Format.wFormatTag);
-        msg_Dbg( p_aout,"waveformat.Format.nChannels       = %u",
-                 waveformat.Format.nChannels);
-        msg_Dbg( p_aout,"waveformat.Format.nSamplesPerSec  = %d",
-                 (int)waveformat.Format.nSamplesPerSec);
-        msg_Dbg( p_aout,"waveformat.Format.nAvgBytesPerSec = %u",
-                 (int)waveformat.Format.nAvgBytesPerSec);
-        msg_Dbg( p_aout,"waveformat.Format.nBlockAlign     = %d",
-                 waveformat.Format.nBlockAlign);
-        msg_Dbg( p_aout,"waveformat.Format.wBitsPerSample  = %d",
-                 waveformat.Format.wBitsPerSample);
-        msg_Dbg( p_aout,"waveformat.Samples.wValidBitsPerSample = %d",
-                 waveformat.Samples.wValidBitsPerSample);
-        msg_Dbg( p_aout,"waveformat.Samples.wSamplesPerBlock = %d",
-                 waveformat.Samples.wSamplesPerBlock);
-        msg_Dbg( p_aout,"waveformat.dwChannelMask          = %lu",
-                 waveformat.dwChannelMask);
-    }
-
-    /* Open the device */
-i_device_id
+WAVE_MAPPER
-                          (WAVEFORMATEX *)&waveformat,
-                          (DWORD_PTR)WaveOutCallback, (DWORD_PTR)p_aout,
@@ -809 +619 @@
- * OpenWaveOutPCM: open a PCM waveout sound device
- ****************************************************************************/
-uint32_t i_device_id, 
+
-                           int i_channels, int i_nb_channels, int i_rate,
-                           vlc_bool_t b_probe )
-{
-
-
-
+
+
+
+
+
-                                   i_channels, i_nb_channels, i_rate, b_probe )
-        != VLC_SUCCESS )
-    {
-i_device_id, 
+
-                          i_channels, i_nb_channels, i_rate, b_probe )
-             != VLC_SUCCESS )
@@ -842 +654 @@
- *****************************************************************************/
-static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout,
-
-
+
-{
-    MMRESULT result;
-
-    /* Prepare the buffer */
-
-
+
-        p_waveheader->lpData = p_buffer->p_buffer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        /* Use silence buffer instead */
-        if(p_aout->output.p_sys->i_repeat_counter)
-        {
-           p_aout->output.p_sys->i_repeat_counter--;
-           if(!p_aout->output.p_sys->i_repeat_counter)
-           {
-               p_aout->p_libvlc->pf_memset( p_aout->output.p_sys->p_silence_buffer,
-                                            0x00,
-                                            p_aout->output.p_sys->i_buffer_size
-                                          );
-           }
-        }
-        p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer;
-    }
-
-    p_waveheader->dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
@@ -927 +712 @@
-
-    /* Don't wake up the thread too much */
-= FRAMES_NUM/
+ FRAMES_NUM / 
-        SetEvent( p_aout->output.p_sys->event );
-}
-
-
-/****************************************************************************
- * WaveOutClearDoneBuffers: Clear all done marked buffers, and free aout_bufer
- ****************************************************************************
- * return value is the number of still playing buffers in the queue
- ****************************************************************************/
-static int WaveOutClearDoneBuffers(aout_sys_t *p_sys)
-{
-    WAVEHDR *p_waveheader = p_sys->waveheader;
-    int i_queued_frames = 0;
-
-    for( int i = 0; i < FRAMES_NUM; i++ )
-    {
-        if( (p_waveheader[i].dwFlags & WHDR_DONE) &&
-            p_waveheader[i].dwUser )
-        {
-            aout_buffer_t *p_buffer =
-                    (aout_buffer_t *)(p_waveheader[i].dwUser);
-            /* Unprepare and free the buffers which has just been played */
-            waveOutUnprepareHeader( p_sys->h_waveout, &p_waveheader[i],
-                                    sizeof(WAVEHDR) );
-
-            if( p_waveheader[i].dwUser != 1 )
-                aout_BufferFree( p_buffer );
-
-            p_waveheader[i].dwUser = 0;
-        }
-
-        /* Check if frame buf is available */
-        if( !(p_waveheader[i].dwFlags & WHDR_DONE) )
-        {
-            i_queued_frames++;
-        }
-    }
-    return i_queued_frames;
-}
-
@@ -983 +731 @@
-    int i, i_queued_frames;
-    vlc_bool_t b_sleek;
-    mtime_t next_date;
-    uint32_t i_buffer_length = 64;
-
-    /* We don't want any resampling when using S/PDIF */
-    b_sleek = p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        /* Cleanup and find out the current latency */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if( p_aout->b_die ) return;
@@ -1022 +773 @@
-            if( p_waveheader[i].dwFlags & WHDR_DONE )
-            {
-                // next_date = mdate() + 1000000 * i_queued_frames /
-                //  p_aout->output.output.i_rate * p_aout->output.i_nb_samples;
-
-                // the realtime has got our back-site:) to come in sync
-                if(next_date < mdate())
-                   next_date = mdate();
-
-
-                /* Take into account the latency */
-                p_buffer = aout_OutputNextBuffer( p_aout,
-
+
+
-                    b_sleek );
-
-                if(!p_buffer)
-                {
-#if 0
-                    msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "\
-                                      "got next_date=%d ms, "\
-                                      "%d frames to play, "\
-                                      "starving? %d",(int)(next_date/(mtime_t)1000),
-                                                     i_queued_frames,
-                                                     p_aout->output.b_starving);
-#endif
-                    if(p_aout->output.b_starving)
-                    {
-                        // means we are too early to request a new buffer?
-                        waveout_warn("waiting...")
-                        next_date = aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
-                        mwait( next_date - AOUT_PTS_TOLERANCE/4 );
-                        next_date = mdate();
-                        p_buffer = aout_OutputNextBuffer( p_aout,
-                                     next_date,
-                                     b_sleek
-                                   );
-                    }
-                }
-
-                if( !p_buffer && i_queued_frames )
@@ -1063 +783 @@
-                    /* We aren't late so no need to play a blank sample */
-                    break;
-                }
-
-                if( p_buffer )
-                {
-                    mtime_t buffer_length = (p_buffer->end_date
-                                             - p_buffer->start_date);
-                    next_date = next_date + buffer_length;
-                    i_buffer_length = buffer_length/1000;
-                }
-
@@ -1084 +796 @@
-
-                PlayWaveOut( p_aout, p_sys->h_waveout,
-, b_sleek
+
-
-                i_queued_frames++;
-            }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -1149 +840 @@
-    return 0;
-}
-
-
-/*
-  reload the configuration drop down list, of the Audio Devices
-*/
-static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name,
-                                 vlc_value_t newval, vlc_value_t oldval, void *data )
-{
-    int i;
-
-    module_config_t *p_item = config_FindConfig( p_this, psz_name );
-    if( !p_item ) return VLC_SUCCESS;
-
-    /* Clear-up the current list */
-    if( p_item->i_list )
-    {
-        /* Keep the first entry */
-        for( i = 1; i < p_item->i_list; i++ )
-        {
-            free((char *)(p_item->ppsz_list[i]) );
-            free((char *)(p_item->ppsz_list_text[i]) );
-        }
-        /* TODO: Remove when no more needed */
-        p_item->ppsz_list[i] = NULL;
-        p_item->ppsz_list_text[i] = NULL;
-    }
-    p_item->i_list = 1;
-
-    int wave_devices = waveOutGetNumDevs();
-
-    p_item->ppsz_list =
-        (char **)realloc( p_item->ppsz_list,
-                          (wave_devices+2) * sizeof(char *) );
-    p_item->ppsz_list_text =
-        (char **)realloc( p_item->ppsz_list_text,
-                          (wave_devices+2) * sizeof(char *) );
-
-    WAVEOUTCAPS caps;
-    char sz_dev_name[MAXPNAMELEN+32];
-    int j=1;
-    for(int i=0; i<wave_devices; i++)
-    {
-        if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
-           == MMSYSERR_NOERROR)
-        {
-          sprintf(sz_dev_name,psz_device_name_fmt,caps.szPname,
-                                               caps.wMid,
-                                               caps.wPid
-                                              );
-          p_item->ppsz_list[j] = strdup( sz_dev_name );
-          p_item->ppsz_list_text[j] = FromLocaleDup( sz_dev_name );
-          p_item->i_list++;
-          j++;
-        }
-
-    }
-    p_item->ppsz_list[j] = NULL;
-    p_item->ppsz_list_text[j] = NULL;
-
-    /* Signal change to the interface */
-    p_item->b_dirty = VLC_TRUE;
-
-    return VLC_SUCCESS;
-}
-
-/*
-  convert devicename to device ID for output
-  if device not found return WAVE_MAPPER, so let
-  windows decide which prefered audio device
-  should be used.
-*/
-static uint32_t findDeviceID(char *psz_device_name)
-{
-    if(!psz_device_name)
-       return WAVE_MAPPER;
-
-    uint32_t wave_devices = waveOutGetNumDevs();
-    WAVEOUTCAPS caps;
-    char sz_dev_name[MAXPNAMELEN+32];
-    for(uint32_t i=0; i<wave_devices; i++)
-    {
-        if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
-           == MMSYSERR_NOERROR)
-        {
-            sprintf(sz_dev_name,psz_device_name_fmt,caps.szPname,
-                                               caps.wMid,
-                                               caps.wPid
-                                              );
-            if(!stricmp(sz_dev_name,psz_device_name))
-               return i;
-        }
-    }
-
-    return WAVE_MAPPER;
-}

po/ca.po

@@ -10 +10 @@
-"Project-Id-Version: vlc 0.8.2-svn\n"
-"Report-Msgid-Bugs-To: vlc-devel@videolan.org\n"
-2-26 19:44+00
+1-07 21:06+01
-"PO-Revision-Date: 2005-04-28 19:16+0100\n"
-"Last-Translator: Lorena Gomes i Xènia Albà\n"
@@ -27 +27 @@
-
-#: include/vlc_config_cat.h:40 include/vlc_config_cat.h:131
-5
+1
-#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:82
-5
+1
-msgid "General"
-msgstr "General"
-
- modules/gui/macosx/simple_prefs.m:87
-73
-7
+
+68
+3
-msgid "Interface"
-msgstr "Interfície"
@@ -56 +56 @@
-msgstr "Paràmetres per a les interfícies del VLC"
-
-51
+47
-msgid "Control interfaces"
-msgstr "Interfícies de control"
@@ -68 +68 @@
-msgstr "Configuració de les tecles ràpides"
-
-9
-8 modules/gui/beos/InterfaceWindow.cpp:284
-69 modules/gui/macosx/intf.m:70
+5
+0 modules/gui/beos/InterfaceWindow.cpp:280
+70 modules/gui/macosx/intf.m:67
-#: modules/gui/macosx/output.m:170 modules/gui/macosx/playlistinfo.m:97
-simple_prefs.m:103 modules/gui/macosx/
-19
-5
+
+07
+0
-#: modules/gui/qt4/ui/sout.ui:631
-#: modules/gui/wxwidgets/dialogs/infopanels.cpp:338
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:852
-82 modules/stream_out/transcode.c:257
+78 modules/stream_out/transcode.c:253
-msgid "Audio"
-msgstr "Àudio"
@@ -87 +87 @@
-
-#: include/vlc_config_cat.h:61 include/vlc_config_cat.h:62
-200
+195
-msgid "General audio settings"
-msgstr "Paràmetres generals d'àudio"
-
-#: include/vlc_config_cat.h:64 include/vlc_config_cat.h:89
-9
+5
-msgid "Filters"
-msgstr "Filtres"
@@ -101 +101 @@
-"Els filtres d'àudio són utilitzats pel post-processament del flux d'àudio"
-
-92
-713 modules/gui/macosx/intf.m:71
+88
+683 modules/gui/macosx/intf.m:68
-msgid "Visualizations"
-msgstr "Visualitzacions"
-
-4
+0
-msgid "Audio visualizations"
-msgstr "Visualitzacions de l'àudio"
@@ -118 +118 @@
-msgstr "Aquests són els paràmetres generals pels mòduls de sortida d'àudio"
-
-8
+7
-#: modules/gui/qt4/ui/sout.ui:758
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:578
-76 modules/stream_out/transcode.c:289
+82 modules/stream_out/transcode.c:285
-msgid "Miscellaneous"
-msgstr "Miscel·lània"
@@ -129 +129 @@
-msgstr "Paràmetres i mòduls varis de l'àudio"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-#: modules/gui/qt4/ui/sout.ui:542
-#: modules/gui/wxwidgets/dialogs/infopanels.cpp:292
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:813
-80 modules/misc/dummy/dummy.c:97
-201
+76 modules/misc/dummy/dummy.c:93
+197
-msgid "Video"
-msgstr "Vídeo"
@@ -149 +148 @@
-
-#: include/vlc_config_cat.h:82 include/vlc_config_cat.h:83
-70
+65
-msgid "General video settings"
-msgstr "Paràmetres generals de vídeo"
@@ -249 +248 @@
-msgstr "Paràmetres avançats d'entrada. Utilitzeu-los amb atenció."
-
-1
-4
+