Rewrite a useful tooltip for Windows DShow.

[vlc] / modules / access / dshow / dshow.cpp

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index ef9e70f46149ef91425746c81f967ce8702b944b..128ed4963633b0292fc29d2eeb295ca90630b8e4 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -158,11 +158,12 @@ static const char *const ppsz_amtuner_mode_text[] = { N_("Default"),
 
 #define AMTUNER_MODE_TEXT N_("AM Tuner mode")
 #define AMTUNER_MODE_LONGTEXT N_( \
-    "AM Tuner mode. Can be one of DEFAULT, TV, AM_RADIO, FM_RADIO or DSS.")
+    "AM Tuner mode. Can be one of Default (0), TV (1)," \
+     "AM Radio (2), FM Radio (3) or DSS (4).")
 
 #define AUDIO_CHANNELS_TEXT N_("Number of audio channels")
 #define AUDIO_CHANNELS_LONGTEXT N_( \
-    "Select audio input format with the given number of audio channesl (if non 0)" )
+    "Select audio input format with the given number of audio channels (if non 0)" )
 
 #define AUDIO_SAMPLERATE_TEXT N_("Audio sample rate")
 #define AUDIO_SAMPLERATE_LONGTEXT N_( \
@@ -243,8 +244,8 @@ vlc_module_begin();
                  AUDIO_CHANNELS_LONGTEXT, true );
     add_integer( "dshow-audio-samplerate", 0, NULL, AUDIO_SAMPLERATE_TEXT,
                  AUDIO_SAMPLERATE_LONGTEXT, true );
-    add_integer( "dshow-audio-bitspersample", 0, NULL, AUDIO_BITPERSAMPLE_TEXT,
-                 AUDIO_BITSPERSAMPLE_LONGTEST, true );
+    add_integer( "dshow-audio-bitspersample", 0, NULL, AUDIO_BITSPERSAMPLE_TEXT,
+                 AUDIO_BITSPERSAMPLE_LONGTEXT, true );
 
     add_shortcut( "dshow" );
     set_capability( "access_demux", 0 );
@@ -1639,7 +1640,7 @@ static block_t *ReadCompressed( access_t *p_access )
 
     while( 1 )
     {
-        if( p_access->b_die || p_access->b_error ) return 0;
+        if( !vlc_object_alive (p_access) || p_access->b_error ) return 0;
 
         /* Get new sample/frame from the elementary stream (blocking). */
         vlc_mutex_lock( &p_sys->lock );