[MPlayer-dev-eng] [PATCH] Remove warning when trying to invoke long-gone alsa9 and alsa1x ao drivers.
Diego Biurrun
diego at biurrun.de
Tue Jan 3 14:40:48 CET 2012
These drivers have been replaced years ago, it's time to drop the hint.
---
help/help_mp-bg.h | 3 ---
help/help_mp-cs.h | 1 -
help/help_mp-de.h | 3 ---
help/help_mp-en.h | 1 -
help/help_mp-es.h | 1 -
help/help_mp-fr.h | 3 ---
help/help_mp-hu.h | 1 -
help/help_mp-it.h | 1 -
help/help_mp-nl.h | 3 ---
help/help_mp-pl.h | 3 ---
help/help_mp-ru.h | 1 -
help/help_mp-sv.h | 3 ---
help/help_mp-tr.h | 3 ---
help/help_mp-zh_CN.h | 1 -
help/help_mp-zh_TW.h | 3 ---
libao2/audio_out.c | 4 ----
16 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index ee71580..aafb272 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -856,9 +856,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: модулите alsa9 и alsa1x са отстранени, използвайте -ao alsa .\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Не може да отвори устройство смесител %s: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup:\nСмесителят на звуковата карта няма канал '%s', използва се подразбиращ се.\n"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index 837d75e..7fbd5fb 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -1105,7 +1105,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: moduly alsa9 a alsa1x byly odstraněny, místo nich použijte -ao alsa.\n"
#define MSGTR_AO_NoSuchDriver "Takové audio rozhraní není '%.*s'\n"
#define MSGTR_AO_FailedInit "Selhala inicializace audio rozhraní '%s'\n"
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index f0cfdd8..2149172 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -1120,9 +1120,6 @@ static const char help_text[]=
// ======================= Audioausgabetreiber ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed \
-"audio_out: Die Module alsa9 und alsa1x wurden entfernt, benutze stattdessen \n" \
-"-ao alsa.\n"
#define MSGTR_AO_NoSuchDriver "Kein Audiotreiber '%.*s'\n"
#define MSGTR_AO_FailedInit "Konnte Audiotreiber '%s' nicht initialisieren\n"
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 8cac0ec..30dcf80 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -1166,7 +1166,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 and alsa1x modules were removed, use -ao alsa instead.\n"
#define MSGTR_AO_NoSuchDriver "No such audio driver '%.*s'\n"
#define MSGTR_AO_FailedInit "Failed to initialize audio driver '%s'\n"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index 61cadf5..c6a1c07 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -1119,7 +1119,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: los módulos alsa9 y alsa1x fueron eliminados, usa -ao alsa.\n"
#define MSGTR_AO_NoSuchDriver "No existe ese controlador de audio '%.*s'\n"
#define MSGTR_AO_FailedInit "Fallo al inicializar controlador de audio '%s'\n"
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index d6e384a..b329f2b 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -1029,9 +1029,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out : modules alsa9 et alsa1x enlevés, utiliser plutôt -ao alsa.\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup : Impossible d'ouvrir mixeur %s : %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup : Mixeur de carte audio n'a pas canal '%s' utilise default.\n"
diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h
index c3cfaff..3bb9558 100644
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@@ -1118,7 +1118,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 és alsa1x modulok törölve lettek, használd a -ao alsa kapcsolót helyettük.\n"
#define MSGTR_AO_NoSuchDriver "Nincs ilyen audió vezérlő: '%.*s'\n"
#define MSGTR_AO_FailedInit "A(z) '%s' audió vezérlő inicializálása nem sikerült\n"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index 70d1490..dc4e175 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -1113,7 +1113,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: i moduli alsa9/alsa1x sono stati rimossi, ora usa -ao alsa.\n"
#define MSGTR_AO_NoSuchDriver "driver audio '%.*s' non trovato\n"
#define MSGTR_AO_FailedInit "Inizializzazione del driver audio '%s' non riuscita\n"
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 099d63a..d736316 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -791,9 +791,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: de alsa9 en alsa1x modules werden verwijderd, gebruik -ao alsa.\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Kan het mixer apparaat %s niet openen : %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup: De mixer van de geluidskaart heeft geen kanaal dat de standaard '%s' gebruikt.\n"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index cd95fe1..51ac23b 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -995,9 +995,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: moduły alsa9 i alsa1x zostały usunięte, użyj w zamian -ao alsa.\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Nie mogę otworzyć mixera %s: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup: Mixer karty dźwiękowej nie ma kanału '%s', używam domyślnego.\n"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index ada9bc9..489efa3 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -1106,7 +1106,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "аудиовывод: модули alsa9 и alsa1x были удалены, используйте -ao alsa взамен.\n"
#define MSGTR_AO_NoSuchDriver "Отсутствует аудио драйвер '%.*s'\n"
#define MSGTR_AO_FailedInit "Не могу инициализировать аудио драйвер '%s'\n"
diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h
index 4b2a241..76bc227 100644
--- a/help/help_mp-sv.h
+++ b/help/help_mp-sv.h
@@ -810,9 +810,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9- samt alsa1xmodulerna har blivit borttagna, använd -ao istället.\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Kan inte öppna mixernehet %s: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup: Audiokortsmixer har inte kanal '%s' använder standard.\n"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index d2abd7c..180a953 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -1043,9 +1043,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "ses_çıkışı: alsa9 ve alsa1x modülleri silindi, yerine -ao seçeneğini kullanınız.\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] ses_kurulumu: %s karıştırıcı aygıtı açılamıyor: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] ses_kurulumu: Ses kartı karıştırıcısı '%s' kanalına sahip değil, varsayılan kullanılıyor.\n"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index 79f68e9..88ce157 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -1166,7 +1166,6 @@ static const char help_text[]=
// ======================= audio output drivers ========================
// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "音频输出：alsa9 和 alsa1x 模块已不支持，请用 -ao alsa 代替。\n"
#define MSGTR_AO_NoSuchDriver "无此音频驱动‘%.*s’\n"
#define MSGTR_AO_FailedInit "未能初始化音频驱动‘%s’\n"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index 913b9aa..af1fd0b 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -1014,9 +1014,6 @@ static const char help_text[]=
// libao2
-// audio_out.c
-#define MSGTR_AO_ALSA9_1x_Removed "音頻輸出: alsa9 和 alsa1x 模塊已被删除, 請用 -ao alsa 代替。\n"
-
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] 音頻設置: 無法打開混音器設備 %s: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] 音頻設置: 聲卡混音器没有'%s', 使用默認通道。\n"
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index c0840a4..56b0b77 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -141,10 +141,6 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate
while(ao_list[0][0]){
char* ao=ao_list[0];
int ao_len;
- if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
- mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
- exit_player(EXIT_NONE);
- }
free(ao_subdevice);
ao_subdevice = NULL;
ao_subdevice=strchr(ao,':');
--
1.7.2.5
More information about the MPlayer-dev-eng
mailing list