This list is closed, nobody may subscribe to it.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(46) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(42) |
Feb
(30) |
Mar
(2) |
Apr
(5) |
May
(45) |
Jun
(62) |
Jul
(43) |
Aug
(70) |
Sep
(9) |
Oct
(29) |
Nov
(39) |
Dec
(75) |
| 2008 |
Jan
(20) |
Feb
(16) |
Mar
(10) |
Apr
(5) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(3) |
Nov
(7) |
Dec
(9) |
| 2009 |
Jan
(14) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(10) |
Sep
(4) |
Oct
|
Nov
(2) |
Dec
(7) |
| 2010 |
Jan
(24) |
Feb
(20) |
Mar
(3) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(9) |
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
(67) |
Feb
(15) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
(16) |
May
(8) |
Jun
(6) |
Jul
|
Aug
(4) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tsz...@us...> - 2015-07-26 19:17:12
|
Revision: 1311
http://sourceforge.net/p/aqualung/code/1311
Author: tszilagyi
Date: 2015-07-26 19:17:08 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
Refresh po files
Modified Paths:
--------------
trunk/po/cs.po
trunk/po/de.po
trunk/po/es.po
trunk/po/fr.po
trunk/po/hu.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/nl.po
trunk/po/pl.po
trunk/po/ru.po
trunk/po/sv.po
trunk/po/uk.po
trunk/po/zh.po
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2015-07-26 19:11:40 UTC (rev 1310)
+++ trunk/po/cs.po 2015-07-26 19:17:08 UTC (rev 1311)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: aqualung SVN\n"
"Report-Msgid-Bugs-To: aqu...@li...\n"
-"POT-Creation-Date: 2014-08-14 20:42+0200\n"
+"POT-Creation-Date: 2015-07-26 21:08+0200\n"
"PO-Revision-Date: 2014-08-21 22:51+0200\n"
"Last-Translator: Pavel Fric <pav...@se...>\n"
"Language-Team: Czech <tra...@li...>\n"
@@ -146,6 +146,10 @@
msgid "Chinese (simplified):\n"
msgstr "Čínština (zjednodušená):\n"
+#, fuzzy
+msgid "Czech:\n"
+msgstr "Francouzština:\n"
+
msgid "Dutch:\n"
msgstr "Holandština:\n"
@@ -203,16 +207,18 @@
"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
"Ave, Cambridge, MA 02139, USA."
msgstr ""
-"Tento program je svobodným softwarem; můžete jej šířit a/nebo modifikovat\na "
-"to podle podmínek GNU General Public Licence, vydávané Free Software "
+"Tento program je svobodným softwarem; můžete jej šířit a/nebo modifikovat\n"
+"a to podle podmínek GNU General Public Licence, vydávané Free Software "
"Foundation; buď verze 2 této licence, nebo (podle vašeho uvážení) kterékoli "
-"pozdější verze.\n\nTento program je rozšiřován v naději, že bude "
-"užitečný, ale BEZ JAKÉKOLIV ZÁRUKY; dokonce i bez předpokládané "
-"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. viz GNU General Public "
-"License pro více informací.\n\nMěli byste obdržet kopii GNU General Public "
-"License spolu s tímto programem; pokud ne, napište na Free "
-"Software Foundation, Inc, 675 Franklin Street, Fifth Floor, Boston, MA "
-"02-139, USA."
+"pozdější verze.\n"
+"\n"
+"Tento program je rozšiřován v naději, že bude užitečný, ale BEZ JAKÉKOLIV "
+"ZÁRUKY; dokonce i bez předpokládané záruky PRODEJNOSTI anebo VHODNOSTI PRO "
+"URČITÝ ÚČEL. viz GNU General Public License pro více informací.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License spolu s tímto programem; "
+"pokud ne, napište na Free Software Foundation, Inc, 675 Franklin Street, "
+"Fifth Floor, Boston, MA 02-139, USA."
msgid "Enabled"
msgstr "Povoleno"
@@ -471,11 +477,11 @@
"or the destination Music Store."
msgstr ""
"\n"
-"Vybraná sbírka desek má již odpovídajícího umělce a album, které již obsahuje "
-"skladby. Pokud stisknete OK, tyto skladby budou odstraněny. Samotné soubory "
-"budou ponechány nedotčeny, ale budou odstraněny z cílové sbírky desek. "
-"Stiskněte Zrušit pro návrat zpět pro změnu umělce/alba, nebo pro návrat zpět "
-"do cílové sbírky desek"
+"Vybraná sbírka desek má již odpovídajícího umělce a album, které již "
+"obsahuje skladby. Pokud stisknete OK, tyto skladby budou odstraněny. Samotné "
+"soubory budou ponechány nedotčeny, ale budou odstraněny z cílové sbírky "
+"desek. Stiskněte Zrušit pro návrat zpět pro změnu umělce/alba, nebo pro "
+"návrat zpět do cílové sbírky desek"
msgid "Rip CD"
msgstr "Vytáhnout skladby z CD"
@@ -718,12 +724,11 @@
"identifier which is unique within an export session."
msgstr ""
"\n"
-"Tento řetězec předlohy, jejž zde zadáte, se použije k sestavení názvu souboru "
-"pro "
-"soubory k vyvedení. Umělec, album a názvy skladeb jsou označeny "
-"%%a, %%r a %%t. Číslo skladby a na formátu závislá přípona souboru "
-"jsou označeny %%n a %%x. Příznak %%i je označení, které je jedinečné "
-"během vyváděcího sezení."
+"Tento řetězec předlohy, jejž zde zadáte, se použije k sestavení názvu "
+"souboru pro soubory k vyvedení. Umělec, album a názvy skladeb jsou označeny "
+"%%a, %%r a %%t. Číslo skladby a na formátu závislá přípona souboru jsou "
+"označeny %%n a %%x. Příznak %%i je označení, které je jedinečné během "
+"vyváděcího sezení."
msgid "Exporting files"
msgstr "Vyvádí se soubory"
@@ -776,8 +781,7 @@
"matching wildcard:"
msgstr ""
"Nekódovat znovu soubory,\n"
-"které odpovídají masce:"
-":"
+"které odpovídají masce::"
msgid "*File info"
msgstr "*Informace o souboru"
@@ -1033,9 +1037,8 @@
"a system tray, or it has not been configured correctly."
msgstr ""
"Aqualung je sestaven s podporou pro oznamovací oblast panelu, ale stavovou "
-"ikonu "
-"se nepodařilo vložit do oznamovací oblasti. Vaše pracovní prostředí buď nemá "
-"podporou pro systémový panel, nebo to nebylo nastaveno správně."
+"ikonu se nepodařilo vložit do oznamovací oblasti. Vaše pracovní prostředí "
+"buď nemá podporou pro systémový panel, nebo to nebylo nastaveno správně."
msgid "Settings"
msgstr "Nastavení"
@@ -1173,7 +1176,8 @@
"Device is busy.\n"
"(Aqualung was unable to claim its interface.)"
msgstr ""
-"Zařízení je zaneprázdněno.\n\n"
+"Zařízení je zaneprázdněno.\n"
+"\n"
"Aqualung nebyl schopen domoci se jeho používání.)"
msgid ""
@@ -1747,8 +1751,8 @@
msgstr ""
"\n"
"Řetězec předlohy, jejž zde zadáte, se použije k sestavení názvového řádku "
-"složeného z umělce, alba a názvu skladby. Tyto jsou označeny "
-"%%a, %%r a %%t.\n"
+"složeného z umělce, alba a názvu skladby. Tyto jsou označeny %%a, %%r a "
+"%%t.\n"
msgid ""
"\n"
@@ -1802,20 +1806,18 @@
"what you can use in the file:\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgstr ""
"\n"
"Soubor, který zde zadáte/vyberete nastaví používání programu Lua pro "
-"rozšíření "
-"Aqualungu. Na podrobnosti se podívejte do příručky k Aqualungu. Zde je rychlý "
-"příklad toho, co "
-"můžete použít v souboru:\n"
+"rozšíření Aqualungu. Na podrobnosti se podívejte do příručky k Aqualungu. "
+"Zde je rychlý příklad toho, co můžete použít v souboru:\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgid ""
@@ -1830,14 +1832,12 @@
msgstr ""
"\n"
"Řetězec, který zde zadáte, bude zpracován jako příkazový řádek, předtím než "
-"bude "
-"zpracován vlastní parameter příkazového řádku. Co zde napíšete, bude sloužit "
-"jako přednastavení a může být nebo nemusí být přepsáno skutečným příkazovým "
-"řádkem.\n"
+"bude zpracován vlastní parameter příkazového řádku. Co zde napíšete, bude "
+"sloužit jako přednastavení a může být nebo nemusí být přepsáno skutečným "
+"příkazovým řádkem.\n"
"\n"
"Příklad: Zadejte '-o alsa -R', aby se používal výstup ALSA ve skutečném čase "
-"jako "
-"výchozí přednastavení.\n"
+"jako výchozí přednastavení.\n"
msgid ""
"Paths must either be absolute or starting with a tilde, which will be "
@@ -1845,11 +1845,11 @@
"\n"
"Drag and drop entries in the list to set the store order in the Music Store."
msgstr ""
-"Cesty musí být buď absolutní, anebo začínat vlnovkou, která bude "
-"rozšířena do domovského adresáře uživatele.\n"
+"Cesty musí být buď absolutní, anebo začínat vlnovkou, která bude rozšířena "
+"do domovského adresáře uživatele.\n"
"\n"
-"Táhněte a pusťte záznamy v seznamu pro nastavení pořadí hudebních sbírek "
-"ve sbírce desek."
+"Táhněte a pusťte záznamy v seznamu pro nastavení pořadí hudebních sbírek ve "
+"sbírce desek."
msgid ""
"\n"
@@ -1867,21 +1867,17 @@
msgstr ""
"\n"
"Nastavte rychlost mechaniky pro přehrávání CD v jednotkách rychlosti CD-ROM. "
-"Jedna "
-"jednotka rychlosti se rovná 176 kB/s rychlosti čtení nezpracovaných dat. "
-"Varování: Ne "
-"všechny mechaniky ctí toto nastavení.\n"
+"Jedna jednotka rychlosti se rovná 176 kB/s rychlosti čtení nezpracovaných "
+"dat. Varování: Ne všechny mechaniky ctí toto nastavení.\n"
"\n"
-"Nižší rychlost obvykle znamená menší hlučnost mechaniky. Nicméně, když se "
-"k opravě chyb používají režimy Paranoia pro zvýšenou přesnost, jsou kvůli "
-"zabránění "
-"podtečení vyrovnávací paměti vyžadovány obecně mnohem vyšší rychlosti "
-"(a tudíž dochází ke slyšitelným výpadkům záznamu na nosiči).\n"
+"Nižší rychlost obvykle znamená menší hlučnost mechaniky. Nicméně, když se k "
+"opravě chyb používají režimy Paranoia pro zvýšenou přesnost, jsou kvůli "
+"zabránění podtečení vyrovnávací paměti vyžadovány obecně mnohem vyšší "
+"rychlosti (a tudíž dochází ke slyšitelným výpadkům záznamu na nosiči).\n"
"\n"
-"Všimněte si, prosím, že tato nastavení se nepoužívají na vytahování skladeb z "
-"CD, což "
-"se vždy děje s nejvyšší dostupnou rychlostí a s režimy pro opravu chyb "
-"nastavenými ručně před každým spuštěním."
+"Všimněte si, prosím, že tato nastavení se nepoužívají na vytahování skladeb "
+"z CD, což se vždy děje s nejvyšší dostupnou rychlostí a s režimy pro opravu "
+"chyb nastavenými ručně před každým spuštěním."
msgid ""
"\n"
@@ -1892,11 +1888,10 @@
msgstr ""
"\n"
"Většina mechanik dá Aqualungu vědět, když bylo CD vloženo nebo odstraněno "
-"poskytnutím příznaku 'media changed'. Nicméně některé mechaniky tento příznak "
-"nevidí "
-"správně, a tak se může stát, že nově vložené CD zůstane Aqualungem "
-"nepovšimnuto. "
-"V takových případech by mělo pomoci povolení této volby."
+"poskytnutím příznaku 'media changed'. Nicméně některé mechaniky tento "
+"příznak nevidí správně, a tak se může stát, že nově vložené CD zůstane "
+"Aqualungem nepovšimnuto. V takových případech by mělo pomoci povolení této "
+"volby."
msgid ""
"\n"
@@ -2271,8 +2266,8 @@
"Use basename only instead of full path\n"
"if no metadata is available."
msgstr ""
-"Použít základní název namísto celé cesty, pokud nejsou dostupná žádná popisná "
-"data."
+"Použít základní název namísto celé cesty, pokud nejsou dostupná žádná "
+"popisná data."
msgid "Metadata editor (File info dialog)"
msgstr "Editor popisných dat (dialog s informacemi o souboru)"
@@ -2281,7 +2276,8 @@
"When adding new frames, try to set their contents\n"
"from another tag's equivalent frame."
msgstr ""
-"Při přidávání nových oken se pokuste o nastavení jejich obsahu z okna značky\n"
+"Při přidávání nových oken se pokuste o nastavení jejich obsahu z okna "
+"značky\n"
"se stejným obsahem."
msgid "MPEG audio ID3v1/ID3v2 character encoding"
@@ -2290,8 +2286,7 @@
msgid "Batch update & encode (mass tagger, CD ripper, file export)"
msgstr ""
"Hromadná aktualizace a zakódování (hromadné značkování, vytažení skladeb z "
-"CD, "
-"vyvedení souborů)"
+"CD, vyvedení souborů)"
msgid "Tags to add when creating or updating MPEG audio files:"
msgstr ""
@@ -2578,8 +2573,8 @@
"\n"
"Do you want to proceed?"
msgstr ""
-"Vybrané soubory budou smazány ze souborového systému. Po "
-"provedení této operace nebude možná žádná obnova.\n"
+"Vybrané soubory budou smazány ze souborového systému. Po provedení této "
+"operace nebude možná žádná obnova.\n"
"\n"
"Chcete pokračovat?"
@@ -2980,9 +2975,8 @@
"File \"%s\" does not exist or your write permission has been withdrawn. "
"Check if the partition containing the store file has been unmounted."
msgstr ""
-"Soubor \"%s\" neexistuje nebo vám byla oprávnění pro zápis odňata. "
-"Prověřte, zda byl diskový oddíl obsahující soubor s hudební sbírkou "
-"odpojen."
+"Soubor \"%s\" neexistuje nebo vám byla oprávnění pro zápis odňata. Prověřte, "
+"zda byl diskový oddíl obsahující soubor s hudební sbírkou odpojen."
msgid "Build / Update store from filesystem..."
msgstr "Vytvořit/Obnovit sbírku ze souborového systému..."
@@ -3366,5 +3360,3 @@
msgid "encoding"
msgstr "Kódování"
-
-
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2015-07-26 19:11:40 UTC (rev 1310)
+++ trunk/po/de.po 2015-07-26 19:17:08 UTC (rev 1311)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: aqualung SVN\n"
"Report-Msgid-Bugs-To: aqu...@li...\n"
-"POT-Creation-Date: 2014-08-31 13:49+0200\n"
+"POT-Creation-Date: 2015-07-26 21:08+0200\n"
"PO-Revision-Date: 2014-08-31 21:13+0100\n"
"Last-Translator: Wolfgang Stoeggl <c7...@ya...>\n"
"Language-Team: German <de...@li...>\n"
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2015-07-26 19:11:40 UTC (rev 1310)
+++ trunk/po/es.po 2015-07-26 19:17:08 UTC (rev 1311)
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Spanish translation 1.0 RC1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-16 17:15+0100\n"
+"Report-Msgid-Bugs-To: aqu...@li...\n"
+"POT-Creation-Date: 2015-07-26 21:08+0200\n"
"PO-Revision-Date: 2011-02-15 02:10-0500\n"
"Last-Translator: Jorge Andrés <win...@gm...>\n"
"Language-Team: Jorge Andrés <win...@gm...>\n"
@@ -21,69 +21,6 @@
"X-Poedit-Language: Spanish\n"
"X-Poedit-Country: PERU\n"
-msgid "About"
-msgstr "Acerca"
-
-msgid "Build version: "
-msgstr "Compilación:"
-
-msgid "Homepage:"
-msgstr "Web del proyecto:"
-
-msgid "Authors:"
-msgstr "Autores:"
-
-msgid "Core design, engineering & programming:\n"
-msgstr "Diseño, ingeniería y programación:\n"
-
-msgid "Skin support, look & feel, GUI hacks:\n"
-msgstr "Soporte del tema, visualización y comportamiento, parches del GUI:\n"
-
-msgid "Programming, GUI engineering:\n"
-msgstr "Programación, ingeniería del GUI:\n"
-
-msgid "OpenBSD compatibility, metadata tweaks:\n"
-msgstr "Compatibilidad OpenBSD, ajustes de metadatos:\n"
-
-msgid "Translators:"
-msgstr "Traductores:"
-
-msgid "Chinese (simplified):\n"
-msgstr "Chino (simplificado):\n"
-
-msgid "French:\n"
-msgstr "Francés:\n"
-
-msgid "German:\n"
-msgstr "Alemán:\n"
-
-msgid "Hungarian:\n"
-msgstr "Húngaro:\n"
-
-msgid "Italian:\n"
-msgstr "Italiano:\n"
-
-msgid "Japanese:\n"
-msgstr "Japones:\n"
-
-msgid "Russian:\n"
-msgstr "Ruso:\n"
-
-msgid "Swedish:\n"
-msgstr "Sueco:\n"
-
-msgid "Ukrainian:\n"
-msgstr "Ucraniano:\n"
-
-msgid "Graphics:"
-msgstr "Gráficos:"
-
-msgid "Logo, icons:\n"
-msgstr "Logotipo, iconos:\n"
-
-msgid "This Aqualung binary is compiled with:"
-msgstr "Este binario de Aqualung es compilado con:"
-
msgid "Optional features:"
msgstr "características opcionales:"
@@ -102,6 +39,10 @@
msgid "iRiver iFP driver support\n"
msgstr "Soporte de controlador iRiver iFP\n"
+#, fuzzy
+msgid "JACK port management support\n"
+msgstr "Configuración de puerto JACK"
+
msgid "Loop playback support\n"
msgstr "Soporte de bucle de reproducción\n"
@@ -177,6 +118,87 @@
msgid "Win32 Sound API\n"
msgstr "API de sonido para WIN32\n"
+msgid "About"
+msgstr "Acerca"
+
+msgid "Build version: "
+msgstr "Compilación:"
+
+msgid "Homepage:"
+msgstr "Web del proyecto:"
+
+msgid "Authors:"
+msgstr "Autores:"
+
+msgid "Core design, engineering & programming:\n"
+msgstr "Diseño, ingeniería y programación:\n"
+
+msgid "Skin support, look & feel, GUI hacks:\n"
+msgstr "Soporte del tema, visualización y comportamiento, parches del GUI:\n"
+
+msgid "Programming, GUI engineering:\n"
+msgstr "Programación, ingeniería del GUI:\n"
+
+msgid "OpenBSD compatibility, metadata tweaks:\n"
+msgstr "Compatibilidad OpenBSD, ajustes de metadatos:\n"
+
+#, fuzzy
+msgid "Miscellaneous, minimalism:\n"
+msgstr "Misceláneo."
+
+msgid "Translators:"
+msgstr "Traductores:"
+
+msgid "Chinese (simplified):\n"
+msgstr "Chino (simplificado):\n"
+
+#, fuzzy
+msgid "Czech:\n"
+msgstr "Francés:\n"
+
+msgid "Dutch:\n"
+msgstr ""
+
+msgid "French:\n"
+msgstr "Francés:\n"
+
+msgid "German:\n"
+msgstr "Alemán:\n"
+
+msgid "Hungarian:\n"
+msgstr "Húngaro:\n"
+
+msgid "Italian:\n"
+msgstr "Italiano:\n"
+
+msgid "Japanese:\n"
+msgstr "Japones:\n"
+
+msgid "Polish:\n"
+msgstr ""
+
+msgid "Russian:\n"
+msgstr "Ruso:\n"
+
+#, fuzzy
+msgid "Spanish:\n"
+msgstr "Sueco:\n"
+
+msgid "Swedish:\n"
+msgstr "Sueco:\n"
+
+msgid "Ukrainian:\n"
+msgstr "Ucraniano:\n"
+
+msgid "Graphics:"
+msgstr "Gráficos:"
+
+msgid "Logo, icons:\n"
+msgstr "Logotipo, iconos:\n"
+
+msgid "This Aqualung binary is compiled with:"
+msgstr "Este binario de Aqualung es compilado con:"
+
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -433,128 +455,6 @@
msgid "Removing non-existing files"
msgstr "Quitando archivos no-existentes"
-msgid "Unknown disc"
-msgstr "Disco desconocido"
-
-msgid "No disc"
-msgstr "Sin disco"
-
-msgid "CDDB query"
-msgstr "Consulta CDDB"
-
-msgid "Retrieving matches from server..."
-msgstr "Obteniendo coincidencias desde servidor..."
-
-msgid "Connecting to CDDB server..."
-msgstr "Conectando al servidor CDDB..."
-
-msgid "Error"
-msgstr "Error"
-
-msgid "An error occurred while attempting to connect to the CDDB server."
-msgstr "Un error ocurrió mientras se intentaba conectar al servidor CDDB."
-
-msgid "Warning"
-msgstr "Advertencia"
-
-msgid "No matching record found."
-msgstr "Sin coincidencia de grabación encontrada."
-
-msgid "Import as Sort Key"
-msgstr "Importar como criterio de ordenación"
-
-msgid "Import as Title"
-msgstr "Importar como título"
-
-msgid "Import as Year"
-msgstr "Importar como año"
-
-msgid ""
-"Artist appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Artista parece estar en su totalidad en minúscula.\n"
-"¿Quiere proceder?"
-
-msgid ""
-"Artist appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Artista parece estar en su totalidad en mayúscula.\n"
-"¿Quiere proceder?"
-
-msgid ""
-"Title appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Título parece estar en su totalidad en minúscula.\n"
-"¿Quiere proceder?"
-
-msgid ""
-"Title appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Título parece estar en su totalidad en mayúscula.\n"
-"¿Quiere proceder?"
-
-msgid ""
-"It is very likely that the year is wrong.\n"
-"Do you want to proceed?"
-msgstr ""
-"Es muy probable que el año este incorrecto.\n"
-"¿Quiere proceder?"
-
-msgid "The email address provided for submission is invalid."
-msgstr ""
-"La dirección de correo electrónico proporcionado para el envío es invalida."
-
-msgid "An error occurred while submitting the record to the CDDB server."
-msgstr "Un error ocurrió mientras se enviaba la grabación al servidor CDDB."
-
-msgid "Correct existing record"
-msgstr "Grabación existente correcta."
-
-msgid "Submit new record"
-msgstr "Enviar nueva grabación"
-
-msgid "Matches:"
-msgstr "Coincidencias:"
-
-msgid "Artist:"
-msgstr "Artista:"
-
-msgid "Title:"
-msgstr "Título:"
-
-msgid "Year:"
-msgstr "Año:"
-
-msgid "Category:"
-msgstr "Categoría:"
-
-msgid "(choose a category)"
-msgstr "(Escoge una categoría)"
-
-msgid "Genre:"
-msgstr "Género:"
-
-msgid "Extended data:"
-msgstr "Datos extendido:"
-
-msgid "Import as Artist"
-msgstr "Importar como Artista"
-
-msgid "Add to Comments"
-msgstr "Agregar a Comentarios"
-
-msgid "Tracks"
-msgstr "Pistas"
-
-msgid "You have to provide an email address for CDDB submission."
-msgstr ""
-"Tiene que proporcionar una dirección de correo electrónico para el envío "
-"CDDB."
-
msgid "Please select the directory for ripped files."
msgstr "Por favor seleccione el directorio para archivos extraídos."
@@ -594,9 +494,18 @@
msgid "Rip CD"
msgstr "Extraer audio del CD"
+msgid "Artist:"
+msgstr "Artista:"
+
msgid "Album:"
msgstr "Álbum:"
+msgid "Year:"
+msgstr "Año:"
+
+msgid "Genre:"
+msgstr "Género:"
+
msgid "Rip"
msgstr "Extraer audio"
@@ -657,6 +566,9 @@
msgid "Maximum number of retries:"
msgstr "Máximo número de reintentos:"
+msgid "Error"
+msgstr "Error"
+
msgid ""
"\n"
"Destination directory is not read-write accessible!"
@@ -688,6 +600,116 @@
msgid "Close"
msgstr "Cerrar"
+msgid "Unknown disc"
+msgstr "Disco desconocido"
+
+msgid "No disc"
+msgstr "Sin disco"
+
+msgid "CDDB query"
+msgstr "Consulta CDDB"
+
+msgid "Retrieving matches from server..."
+msgstr "Obteniendo coincidencias desde servidor..."
+
+msgid "Connecting to CDDB server..."
+msgstr "Conectando al servidor CDDB..."
+
+msgid "An error occurred while attempting to connect to the CDDB server."
+msgstr "Un error ocurrió mientras se intentaba conectar al servidor CDDB."
+
+msgid "Warning"
+msgstr "Advertencia"
+
+msgid "No matching record found."
+msgstr "Sin coincidencia de grabación encontrada."
+
+msgid "Import as Sort Key"
+msgstr "Importar como criterio de ordenación"
+
+msgid "Import as Title"
+msgstr "Importar como título"
+
+msgid "Import as Year"
+msgstr "Importar como año"
+
+msgid ""
+"Artist appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Artista parece estar en su totalidad en minúscula.\n"
+"¿Quiere proceder?"
+
+msgid ""
+"Artist appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Artista parece estar en su totalidad en mayúscula.\n"
+"¿Quiere proceder?"
+
+msgid ""
+"Title appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Título parece estar en su totalidad en minúscula.\n"
+"¿Quiere proceder?"
+
+msgid ""
+"Title appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Título parece estar en su totalidad en mayúscula.\n"
+"¿Quiere proceder?"
+
+msgid ""
+"It is very likely that the year is wrong.\n"
+"Do you want to proceed?"
+msgstr ""
+"Es muy probable que el año este incorrecto.\n"
+"¿Quiere proceder?"
+
+msgid "The email address provided for submission is invalid."
+msgstr ""
+"La dirección de correo electrónico proporcionado para el envío es invalida."
+
+msgid "An error occurred while submitting the record to the CDDB server."
+msgstr "Un error ocurrió mientras se enviaba la grabación al servidor CDDB."
+
+msgid "Correct existing record"
+msgstr "Grabación existente correcta."
+
+msgid "Submit new record"
+msgstr "Enviar nueva grabación"
+
+msgid "Matches:"
+msgstr "Coincidencias:"
+
+msgid "Title:"
+msgstr "Título:"
+
+msgid "Category:"
+msgstr "Categoría:"
+
+msgid "(choose a category)"
+msgstr "(Escoge una categoría)"
+
+msgid "Extended data:"
+msgstr "Datos extendido:"
+
+msgid "Import as Artist"
+msgstr "Importar como Artista"
+
+msgid "Add to Comments"
+msgstr "Agregar a Comentarios"
+
+msgid "Tracks"
+msgstr "Pistas"
+
+msgid "You have to provide an email address for CDDB submission."
+msgstr ""
+"Tiene que proporcionar una dirección de correo electrónico para el envío "
+"CDDB."
+
msgid "Unknown Album"
msgstr "Álbum desconocido"
@@ -703,23 +725,38 @@
msgid "Help"
msgstr "Ayuda"
-#, c-format
+#, fuzzy, c-format
msgid ""
"\n"
"The template string you enter here will be used to construct the filename of "
-"the exported files. The Artist, Record and Track names are denoted by %%a, "
-"%%r and %%t. The track number and format-dependent file extension are "
-"denoted by %%n and %%x, respectively. The flag %%i gives an identifier "
-"which is unique within an export session."
+"the exported files. The Original filename, Artist, Record and Track names "
+"are denoted by %%o, %%a, %%r and %%t. The track number and format-dependent "
+"file extension are denoted by %%n and %%x, respectively. %%i gives an "
+"identifier which is unique within an export session."
msgstr ""
"\n"
"La plantilla de cadena de texto entrado aquí será usado para construir el "
"nombre del archivo exportado. Los nombres de Artista, Grabación y Pista "
-"serán denotados por %%a, %%r y %%t. El número de pista y la extensión "
-"de archivo formato-dependiente son denotados por %%n y %%x, "
-"respectivamente. El indicador %%i da un identificador que es único dentro "
-"de un exportación de sesión."
+"serán denotados por %%a, %%r y %%t. El número de pista y la extensión de "
+"archivo formato-dependiente son denotados por %%n y %%x, respectivamente. "
+"El indicador %%i da un identificador que es único dentro de un exportación "
+"de sesión."
+msgid "Exporting files"
+msgstr "Exportando archivos"
+
+msgid "Source file:"
+msgstr "Archivo fuente:"
+
+msgid "Target file:"
+msgstr "Archivo destino:"
+
+msgid "Progress:"
+msgstr "Progreso:"
+
+msgid "Error in format string"
+msgstr "Error en formato de la cadena de texto"
+
msgid "Export files"
msgstr "Exportar archivos"
@@ -758,21 +795,6 @@
"No recodificar archivos\n"
"Comodines coincidentes:"
-msgid "Error in format string"
-msgstr "Error en formato de la cadena de texto"
-
-msgid "Exporting files"
-msgstr "Exportando archivos"
-
-msgid "Source file:"
-msgstr "Archivo fuente:"
-
-msgid "Target file:"
-msgstr "Archivo destino:"
-
-msgid "Progress:"
-msgstr "Progreso:"
-
msgid "*File info"
msgstr "Información de *Archivo"
@@ -879,6 +901,16 @@
msgid "tag:"
msgstr "Etiqueta:"
+#, c-format
+msgid "%ld Hz"
+msgstr "%ld Hz"
+
+msgid "MONO"
+msgstr "MONO"
+
+msgid "STEREO"
+msgstr "ESTÉREO"
+
msgid "Audio CD"
msgstr "CD de audio"
@@ -900,19 +932,9 @@
msgid "Samplerate:"
msgstr "Tasa de muestreo:"
-#, c-format
-msgid "%ld Hz"
-msgstr "%ld Hz"
-
msgid "Channel count:"
msgstr "Contador de canales:"
-msgid "MONO"
-msgstr "MONO"
-
-msgid "STEREO"
-msgstr "ESTÉREO"
-
msgid "Bandwidth:"
msgstr "Ancho de banda:"
@@ -1014,9 +1036,8 @@
msgid "JACK connection lost"
msgstr "Conexión JACK perdida"
-msgid ""
-"JACK has either been shutdown or it disconnected Aqualung because it was not "
-"fast enough. All you can do now is restart both JACK and Aqualung."
+#, fuzzy, c-format
+msgid "JACK has either been shutdown or it disconnected Aqualung. Reason: %s"
msgstr ""
"JACK también ha sido apagado o desconectado de Aqualung porque no fue lo "
"suficientemente rápido. Todo lo que puede hacer ahora es reiniciar JACK y "
@@ -1299,36 +1320,6 @@
msgid "_Abort"
msgstr "_Abortar"
-msgid "Success"
-msgstr "Éxito"
-
-msgid "Memory allocation error"
-msgstr "Error en la asignación de memoria"
-
-msgid "Unable to open file"
-msgstr "Incapaz de abrir archivo"
-
-msgid "No metadata support for this format"
-msgstr "Sin soporte para metadatos para este formato."
-
-msgid "File is not writable"
-msgstr "Archivo no es escribible."
-
-msgid "Invalid 'Track no.' field value"
-msgstr "Valor del campo 'No de pista' invalido "
-
-msgid "Invalid 'Genre' field value"
-msgstr "Valor del campo 'Genero' invalido"
-
-msgid "Conversion to target charset failed"
-msgstr "Conversión de destino a juego de caracteres fallido"
-
-msgid "Internal error"
-msgstr "Error interno"
-
-msgid "Unknown error"
-msgstr "Error desconocido"
-
msgid "Album"
msgstr "Álbum"
@@ -1623,6 +1614,36 @@
msgid "Unknown"
msgstr "Desconocido"
+msgid "Success"
+msgstr "Éxito"
+
+msgid "Memory allocation error"
+msgstr "Error en la asignación de memoria"
+
+msgid "Unable to open file"
+msgstr "Incapaz de abrir archivo"
+
+msgid "No metadata support for this format"
+msgstr "Sin soporte para metadatos para este formato."
+
+msgid "File is not writable"
+msgstr "Archivo no es escribible."
+
+msgid "Invalid 'Track no.' field value"
+msgstr "Valor del campo 'No de pista' invalido "
+
+msgid "Invalid 'Genre' field value"
+msgstr "Valor del campo 'Genero' invalido"
+
+msgid "Conversion to target charset failed"
+msgstr "Conversión de destino a juego de caracteres fallido"
+
+msgid "Internal error"
+msgstr "Error interno"
+
+msgid "Unknown error"
+msgstr "Error desconocido"
+
msgid "Other"
msgstr "Otro"
@@ -1810,8 +1831,8 @@
"what you can use in the file:\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgstr ""
"\n"
@@ -1820,8 +1841,8 @@
"rápido de que puede usar en el archivo:\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgid ""
@@ -1960,6 +1981,12 @@
msgid "Command"
msgstr "Comando"
+msgid "Error in title format string"
+msgstr "Error en el formato de la cadena de texto del título"
+
+msgid "Error invalid character encoding"
+msgstr "Error codificación de caracteres inválido"
+
msgid "Main window"
msgstr "Ventana principal"
@@ -2042,6 +2069,9 @@
msgid "Don't show cover thumbnail in the main window"
msgstr "No mostrar miniatura de cobertura en al ventana principal"
+msgid "Use cover from external graphics file first"
+msgstr ""
+
msgid "Enable tooltips"
msgstr "Habilitar sugerencias"
@@ -2406,12 +2436,6 @@
msgid "Active song in playlist: "
msgstr "Canción activa en lista de reproducción:"
-msgid "Error in title format string"
-msgstr "Error en el formato de la cadena de texto del título"
-
-msgid "Error invalid character encoding"
-msgstr "Error codificación de caracteres inválido"
-
msgid "(Untitled)"
msgstr "(Sin Título)"
@@ -3284,6 +3308,21 @@
msgid "Calculating volume level"
msgstr "Calculando nivel de volumen"
+msgid "Compression: Fast"
+msgstr "Compresión: Rápido"
+
+msgid "Compression: Normal"
+msgstr "Compresión: Normal"
+
+msgid "Compression: High"
+msgstr "Compresión: Alto"
+
+msgid "Compression: Extra High"
+msgstr "Compresión: Extra Alto"
+
+msgid "Compression: Insane"
+msgstr "Compresión: Insensato"
+
msgid "Profile: Telephone"
msgstr "Perfil: Teléfono"
@@ -3352,18 +3391,3 @@
msgid "encoding"
msgstr "Codificando"
-
-msgid "Compression: Fast"
-msgstr "Compresión: Rápido"
-
-msgid "Compression: Normal"
-msgstr "Compresión: Normal"
-
-msgid "Compression: High"
-msgstr "Compresión: Alto"
-
-msgid "Compression: Extra High"
-msgstr "Compresión: Extra Alto"
-
-msgid "Compression: Insane"
-msgstr "Compresión: Insensato"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2015-07-26 19:11:40 UTC (rev 1310)
+++ trunk/po/fr.po 2015-07-26 19:17:08 UTC (rev 1311)
@@ -14,72 +14,16 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-12 22:03+0100\n"
+"Report-Msgid-Bugs-To: aqu...@li...\n"
+"POT-Creation-Date: 2015-07-26 21:08+0200\n"
"PO-Revision-Date: 2010-02-11 19:23+0100\n"
"Last-Translator: Louis Opter <kal...@ka...>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-msgid "About"
-msgstr "A propos"
-
-msgid "Build version: "
-msgstr "Version générée :"
-
-msgid "Homepage:"
-msgstr "Page d'accueil :"
-
-msgid "Authors:"
-msgstr "Auteurs :"
-
-msgid "Core design, engineering & programming:\n"
-msgstr "Architecture, développement & programmation :\n"
-
-msgid "Skin support, look & feel, GUI hacks:\n"
-msgstr "Support des thèmes, apparence, bidouilles de l'interface :\n"
-
-msgid "Programming, GUI engineering:\n"
-msgstr "Programmation et conception de l'interface graphique :\n"
-
-msgid "OpenBSD compatibility, metadata tweaks:\n"
-msgstr "Compatibilité OpenBSD, bidouilles des meta-données :\n"
-
-msgid "Translators:"
-msgstr "Traducteurs :"
-
-msgid "German:\n"
-msgstr "Allemand :\n"
-
-msgid "Hungarian:\n"
-msgstr "Hongrois :\n"
-
-msgid "Italian:\n"
-msgstr "Italien :\n"
-
-msgid "Japanese:\n"
-msgstr "Japonnais :\n"
-
-msgid "Russian:\n"
-msgstr "Russe :\n"
-
-msgid "Swedish:\n"
-msgstr "Suédois :\n"
-
-msgid "Ukrainian:\n"
-msgstr "Ukrainien :\n"
-
-msgid "Graphics:"
-msgstr "Graphismes :"
-
-msgid "Logo, icons:\n"
-msgstr "Logo, icônes :\n"
-
-msgid "This Aqualung binary is compiled with:"
-msgstr "Ce binaire d'Aqualung est compilé avec :"
-
msgid "Optional features:"
msgstr "Fonctionnalités optionnelles"
@@ -98,6 +42,10 @@
msgid "iRiver iFP driver support\n"
msgstr "Support du pilote iRiver iFP\n"
+#, fuzzy
+msgid "JACK port management support\n"
+msgstr "Configuration de JACK"
+
msgid "Loop playback support\n"
msgstr "Support de lecture en boucle\n"
@@ -107,8 +55,9 @@
msgid "Podcast support\n"
msgstr "Support du Podcast\n"
-msgid "Lua (programmable title formatting) support\n"
-msgstr "Support de Lua (formatage programmable des titres)\n"
+#, fuzzy
+msgid "Lua extension support\n"
+msgstr "Désactiver le support des thèmes"
msgid "Decoding support:"
msgstr "Support du décodage :"
@@ -173,7 +122,88 @@
msgid "Win32 Sound API\n"
msgstr "Win32 Sound API\n"
-msgid "Win32 Sound API\n"
+msgid "About"
+msgstr "A propos"
+
+msgid "Build version: "
+msgstr "Version générée :"
+
+msgid "Homepage:"
+msgstr "Page d'accueil :"
+
+msgid "Authors:"
+msgstr "Auteurs :"
+
+msgid "Core design, engineering & programming:\n"
+msgstr "Architecture, développement & programmation :\n"
+
+msgid "Skin support, look & feel, GUI hacks:\n"
+msgstr "Support des thèmes, apparence, bidouilles de l'interface :\n"
+
+msgid "Programming, GUI engineering:\n"
+msgstr "Programmation et conception de l'interface graphique :\n"
+
+msgid "OpenBSD compatibility, metadata tweaks:\n"
+msgstr "Compatibilité OpenBSD, bidouilles des meta-données :\n"
+
+#, fuzzy
+msgid "Miscellaneous, minimalism:\n"
+msgstr "Divers"
+
+msgid "Translators:"
+msgstr "Traducteurs :"
+
+msgid "Chinese (simplified):\n"
+msgstr ""
+
+msgid "Czech:\n"
+msgstr ""
+
+msgid "Dutch:\n"
+msgstr ""
+
+msgid "French:\n"
+msgstr ""
+
+msgid "German:\n"
+msgstr "Allemand :\n"
+
+msgid "Hungarian:\n"
+msgstr "Hongrois :\n"
+
+msgid "Italian:\n"
+msgstr "Italien :\n"
+
+msgid "Japanese:\n"
+msgstr "Japonnais :\n"
+
+msgid "Polish:\n"
+msgstr ""
+
+msgid "Russian:\n"
+msgstr "Russe :\n"
+
+#, fuzzy
+msgid "Spanish:\n"
+msgstr "Suédois :\n"
+
+msgid "Swedish:\n"
+msgstr "Suédois :\n"
+
+msgid "Ukrainian:\n"
+msgstr "Ukrainien :\n"
+
+msgid "Graphics:"
+msgstr "Graphismes :"
+
+msgid "Logo, icons:\n"
+msgstr "Logo, icônes :\n"
+
+msgid "This Aqualung binary is compiled with:"
+msgstr "Ce binaire d'Aqualung est compilé avec :"
+
+#, fuzzy
+msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
"Software Foundation; either version 2 of the License, or (at your option) "
@@ -187,20 +217,21 @@
"You should have received a copy of the GNU General Public License along with "
"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
"Ave, Cambridge, MA 02139, USA."
-msgstr "Win32 Sound API\n"
-"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le"
-"modifier suivant les termes de la “GNU General Public License” telle que"
-"publiée par la Free Software Foundation : soit la version 2 de cette"
-"licence, soit (à votre gré) toute version ultérieure.\n"
+msgstr ""
+"Win32 Sound API\n"
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou "
+"lemodifier suivant les termes de la “GNU General Public License” telle "
+"quepubliée par la Free Software Foundation : soit la version 2 de "
+"cettelicence, soit (à votre gré) toute version ultérieure.\n"
"\n"
-"Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS"
-"AUCUNE GARANTIE : sans même la garantie implicite de COMMERCIALISABILITÉ"
-"ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale"
-"Publique GNU pour plus de détails\n."
-"\n"
-"Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec"
-"ce programme ; si ce n’est pas le cas, écrivez à Free Software Foundation,"
-"Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+"Ce programme est distribué dans l’espoir qu’il vous sera utile, mais "
+"SANSAUCUNE GARANTIE : sans même la garantie implicite de "
+"COMMERCIALISABILITÉni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la "
+"Licence GénéralePublique GNU pour plus de détails\n"
+".\n"
+"Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avecce "
+"programme ; si ce n’est pas le cas, écrivez à Free Software Foundation,Inc., "
+"675 Mass Ave, Cambridge, MA 02139, USA."
msgid "Enabled"
msgstr "Activé"
@@ -428,125 +459,6 @@
msgid "Removing non-existing files"
msgstr "Enlever les fichiers inexistants"
-msgid "Unknown disc"
-msgstr "Disque inconnu"
-
-msgid "No disc"
-msgstr "Pas de disque"
-
-msgid "CDDB query"
-msgstr "Requête vers CDDB"
-
-msgid "Retrieving matches from server..."
-msgstr "Récupération des correspondances depuis le serveur..."
-
-msgid "Connecting to CDDB server..."
-msgstr "Connexion au serveur CDDB..."
-
-msgid "Error"
-msgstr "Erreur"
-
-msgid "An error occurred while attempting to connect to the CDDB server."
-msgstr "Une erreur est survenue lors de la connexion au serveur CDDB."
-
-msgid "Warning"
-msgstr "Attention"
-
-msgid "No matching record found."
-msgstr "Pas d'album correspondant trouvé."
-
-msgid "Import as Sort Key"
-msgstr "Importer comme clé de tri"
-
-msgid "Import as Title"
-msgstr "Importer comme un titre"
-
-msgid "Import as Year"
-msgstr "Importer comme une année"
-
-msgid ""
-"Artist appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"L'artiste est entièrement en minuscules.\n"
-"Voulez vous continuer ?"
-
-msgid ""
-"Artist appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"L'artiste est entièrement en majuscules.\n"
-"Voulez vous continuer ?"
-
-msgid ""
-"Title appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Le titre est entièrement en minuscules.\n"
-"Voulez vous continuer ?"
-
-msgid ""
-"Title appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Le titre est entièrement en majuscules.\n"
-"Voulez vous continuer ?"
-
-msgid ""
-"It is very likely that the year is wrong.\n"
-"Do you want to proceed?"
-msgstr ""
-"Il est très probable que l'année soit fausse.\n"
-"Voulez vous continuer ?"
-
-msgid "The email address provided for submission is invalid."
-msgstr "L'adresse de courriel fournie pour la proposition est invalide."
-
-msgid "An error occurred while submitting the record to the CDDB server."
-msgstr "Une erreur est survenue lors de la proposition de l'album au serveur CDDB"
-
-msgid "Correct existing record"
-msgstr "Correction de l'album existant"
-
-msgid "Submit new record"
-msgstr "Soumettre un nouvel album"
-
-msgid "Matches:"
-msgstr "Concordances :"
-
-msgid "Artist:"
-msgstr "Artiste :"
-
-msgid "Title:"
-msgstr "Titre :"
-
-msgid "Year:"
-msgstr "Année :"
-
-msgid "Category:"
-msgstr "Catégorie :"
-
-msgid "(choose a category)"
-msgstr "(choisir une catégorie)"
-
-msgid "Genre:"
-msgstr "Genre :"
-
-msgid "Extended data:"
-msgstr "Données étendues :"
-
-msgid "Import as Artist"
-msgstr "Importer comme Artiste"
-
-msgid "Add to Comments"
-msgstr "Ajouter aux commentaires"
-
-msgid "Tracks"
-msgstr "Pistes"
-
-msgid "You have to provide an email address for CDDB submission."
-msgstr "Vous devez fournir une adresse de courriels pour faire une proposition sur CDDB"
-
msgid "Please select the directory for ripped files."
msgstr "Sélectionnez le dossier pour les fichiers copiés."
@@ -577,18 +489,27 @@
"or the destination Music Store."
msgstr ""
"\n"
-"La Discothèque que vous avez sélectionné a une correspondance avec un Artiste et un Album "
-"contenant déjà certaines pistes. Si vous appuyez sur OK, ces pistes seront enlevées. Les "
-"fichiers eux mêmes seront laissés intacts, mais ils seront enlevé "
-"de la Discothèque cible. Appuyez sur Annuler pour revenir en arrière pour changer les Artistes/Albums"
-"ou la Discothèque cible."
+"La Discothèque que vous avez sélectionné a une correspondance avec un "
+"Artiste et un Album contenant déjà certaines pistes. Si vous appuyez sur OK, "
+"ces pistes seront enlevées. Les fichiers eux mêmes seront laissés intacts, "
+"mais ils seront enlevé de la Discothèque cible. Appuyez sur Annuler pour "
+"revenir en arrière pour changer les Artistes/Albumsou la Discothèque cible."
msgid "Rip CD"
msgstr "Copier un CD"
+msgid "Artist:"
+msgstr "Artiste :"
+
msgid "Album:"
msgstr "Album :"
+msgid "Year:"
+msgstr "Année :"
+
+msgid "Genre:"
+msgstr "Genre :"
+
msgid "Rip"
msgstr "Copier"
@@ -649,6 +570,9 @@
msgid "Maximum number of retries:"
msgstr "Nombre maximal de tentatives :"
+msgid "Error"
+msgstr "Erreur"
+
msgid ""
"\n"
"Destination directory is not read-write accessible!"
@@ -680,6 +604,116 @@
msgid "Close"
msgstr "Fermer"
+msgid "Unknown disc"
+msgstr "Disque inconnu"
+
+msgid "No disc"
+msgstr "Pas de disque"
+
+msgid "CDDB query"
+msgstr "Requête vers CDDB"
+
+msgid "Retrieving matches from server..."
+msgstr "Récupération des correspondances depuis le serveur..."
+
+msgid "Connecting to CDDB server..."
+msgstr "Connexion au serveur CDDB..."
+
+msgid "An error occurred while attempting to connect to the CDDB server."
+msgstr "Une erreur est survenue lors de la connexion au serveur CDDB."
+
+msgid "Warning"
+msgstr "Attention"
+
+msgid "No matching record found."
+msgstr "Pas d'album correspondant trouvé."
+
+msgid "Import as Sort Key"
+msgstr "Importer comme clé de tri"
+
+msgid "Import as Title"
+msgstr "Importer comme un titre"
+
+msgid "Import as Year"
+msgstr "Importer comme une année"
+
+msgid ""
+"Artist appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"L'artiste est entièrement en minuscules.\n"
+"Voulez vous continuer ?"
+
+msgid ""
+"Artist appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"L'artiste est entièrement en majuscules.\n"
+"Voulez vous continuer ?"
+
+msgid ""
+"Title appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Le titre est entièrement en minuscules.\n"
+"Voulez vous continuer ?"
+
+msgid ""
+"Title appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Le titre est entièrement en majuscules.\n"
+"Voulez vous continuer ?"
+
+msgid ""
+"It is very likely that the year is wrong.\n"
+"Do you want to proceed?"
+msgstr ""
+"Il est très probable que l'année soit fausse.\n"
+"Voulez vous continuer ?"
+
+msgid "The email address provided for submission is invalid."
+msgstr "L'adresse de courriel fournie pour la proposition est invalide."
+
+msgid "An error occurred while submitting the record to the CDDB server."
+msgstr ""
+"Une erreur est survenue lors de la proposition de l'album au serveur CDDB"
+
+msgid "Correct existing record"
+msgstr "Correction de l'album existant"
+
+msgid "Submit new record"
+msgstr "Soumettre un nouvel album"
+
+msgid "Matches:"
+msgstr "Concordances :"
+
+msgid "Title:"
+msgstr "Titre :"
+
+msgid "Category:"
+msgstr "Catégorie :"
+
+msgid "(choose a category)"
+msgstr "(choisir une catégorie)"
+
+msgid "Extended data:"
+msgstr "Données étendues :"
+
+msgid "Import as Artist"
+msgstr "Importer comme Artiste"
+
+msgid "Add to Comments"
+msgstr "Ajouter aux commentaires"
+
+msgid "Tracks"
+msgstr "Pistes"
+
+msgid "You have to provide an email address for CDDB submission."
+msgstr ""
+"Vous devez fournir une adresse de courriels pour faire une proposition sur "
+"CDDB"
+
msgid "Unknown Album"
msgstr "Album inconnu"
@@ -695,23 +729,37 @@
msgid "Help"
msgstr "Aide"
-#, c-format
+#, fuzzy, c-format
msgid ""
"\n"
"The template string you enter here will be used to construct the filename of "
-"the exported files. The Artist, Record and Track names are denoted by %%a, "
-"%%r and %%t. The track number and format-dependent file extension are "
-"denoted by %%n and %%x, respectively. The flag %%i gives an identifier "
-"which is unique within an export session."
+"the exported files. The Original filename, Artist, Record and Track names "
+"are denoted by %%o, %%a, %%r and %%t. The track number and format-dependent "
+"file extension are denoted by %%n and %%x, respectively. %%i gives an "
+"identifier which is unique within an export session."
msgstr ""
"\n"
"Le patron de chaîne de caractères que vous entrez ici sera utilisé pour "
"générer les noms des fichiers exportés. L'artiste, l'album et le nom des "
-"pistes sont notés par %%a, %%r et %%t. Le numéro de piste et "
-"l'extension du fichier sont respectivement notés %%n et %%x. Le "
-"drapeau %%i donne un identifiant qui est unique pour une session "
-"d'export."
+"pistes sont notés par %%a, %%r et %%t. Le numéro de piste et l'extension du "
+"fichier sont respectivement notés %%n et %%x. Le drapeau %%i donne un "
+"identifiant qui est unique pour une session d'export."
+msgid "Exporting files"
+msgstr "Export des fichiers..."
+
+msgid "Source file:"
+msgstr "Fichier source :"
+
+msgid "Target file:"
+msgstr "Fichier cible :"
+
+msgid "Progress:"
+msgstr "Progression :"
+
+msgid "Error in format string"
+msgstr "Erreur dans la chaîne de format"
+
msgid "Export files"
msgstr "Exporter les fichiers"
@@ -741,7 +789,8 @@
msgstr "Filtre"
msgid "Do not reencode files already being in the target format"
-msgstr "Ne pas encoder de nouveau les fichiers qui sont déjà dans le bon format"
+msgstr ""
+"Ne pas encoder de nouveau les fichiers qui sont déjà dans le bon format"
msgid ""
"Do not reencode files\n"
@@ -750,21 +799,6 @@
"Ne pas encoder de nouveaux les fichiers\n"
"qui correspondent à ce joker:"
-msgid "Error in format string"
-msgstr "Erreur dans la chaîne de format"
-
-msgid "Exporting files"
-msgstr "Export des fichiers..."
-
-msgid "Source file:"
-msgstr "Fichier source :"
-
-msgid "Target file:"
-msgstr "Fichier cible :"
-
-msgid "Progress:"
-msgstr "Progression :"
-
msgid "*File info"
msgstr "*Informations sur le fichier"
@@ -787,7 +821,8 @@
msgid ""
"Conversion error in field %s:\n"
"'%s' does not conform to format '%s'!"
-msgstr "Erreur de conversion dans le champs %s :\n"
+msgstr ""
+"Erreur de conversion dans le champs %s :\n"
"'%s' ne correspond pas au format '%s'!"
msgid ""
@@ -870,6 +905,16 @@
msgid "tag:"
msgstr "étiquette :"
+#, c-format
+msgid "%ld Hz"
+msgstr "%ld Hz"
+
+msgid "MONO"
+msgstr "MONO"
+
+msgid "STEREO"
+msgstr "STEREO"
+
msgid "Audio CD"
msgstr "CD Audio"
@@ -891,19 +936,9 @@
msgid "Samplerate:"
msgstr "Taux d'échantillonage :"
-#, c-format
-msgid "%ld Hz"
-msgstr "%ld Hz"
-
msgid "Channel count:"
msgstr "Nombre de canaux :"
-msgid "MONO"
-msgstr "MONO"
-
-msgid "STEREO"
-msgstr "STEREO"
-
msgid "Bandwidth:"
msgstr "Bande passante :"
@@ -1005,25 +1040,26 @@
msgid "JACK connection lost"
msgstr "Connexion avec JACK perdue"
-msgid ""
-"JACK has either been shutdown or it disconnected Aqualung because it was not "
-"fast enough. All you can do now is restart both JACK and Aqualung."
+#, fuzzy, c-format
+msgid "JACK has either been shutdown or it disconnected Aqualung. Reason: %s"
msgstr ""
-"Soit JACK a été éteint soit il a déconnecté Aqualung car il n'était pas assez "
-"rapide. Vous n'avez pas d'autres choix que de relancer JACK et Aqualung."
+"Soit JACK a été éteint soit il a déconnecté Aqualung car il n'était pas "
+"assez rapide. Vous n'avez pas d'autres choix que de relancer JACK et "
+"Aqualung."
msgid "Warn me if the Window Manager does not support system tray"
-msgstr "Me prévenir si le gestionnaire de fenêtre ne supporte pas la zone "
-"de notifications"
+msgstr ""
+"Me prévenir si le gestionnaire de fenêtre ne supporte pas la zone de "
+"notifications"
msgid ""
"Aqualung is compiled with system tray support, but the status icon could not "
"be embedded in the notification area. Your desktop may not have support for "
"a system tray, or it has not been configured correctly."
msgstr ""
-"Aqualung n'arrive pas à utiliser la zone de notification. Peut-être que votre "
-"gestionnaire de fenêtre ne supporte pas la zone de notification ou qu'il est "
-"mal configuré."
+"Aqualung n'arrive pas à utiliser la zone de notification. Peut-être que "
+"votre gestionnaire de fenêtre ne supporte pas la zone de notification ou "
+"qu'il est mal configuré."
msgid "Settings"
msgstr "Préférences"
@@ -1095,7 +1131,9 @@
msgstr "%d / %d dossiers"
msgid "Cannot write to selected directory. Please select another directory."
-msgstr "Impossible d'écrire vers le dossier sélectionné. Veuillez en choisir un autre."
+msgstr ""
+"Impossible d'écrire vers le dossier sélectionné. Veuillez en choisir un "
+"autre."
msgid "Done"
msgstr "Fini"
@@ -1173,7 +1211,8 @@
msgstr "Veuillez sélectionner un chemin local."
msgid "Please select at least one valid song from playlist."
-msgstr "Veuillez sélectionner au moins une piste valide depuis la liste de lecture."
+msgstr ""
+"Veuillez sélectionner au moins une piste valide depuis la liste de lecture."
#, c-format
msgid ""
@@ -1191,7 +1230,8 @@
"\n"
"Do you want to proceed?"
msgstr ""
-"%d sur %d pistes sont dans un format qui n'est pas supporté par votre lecteur.\n"
+"%d sur %d pistes sont dans un format qui n'est pas supporté par votre "
+"lecteur.\n"
"\n"
"Voulez vous continuer ?"
@@ -1201,7 +1241,8 @@
"\n"
"Do you want to proceed?"
msgstr ""
-"La piste sélectionnée est dans un format qui n'est pas supporté par votre lecteur.\n"
+"La piste sélectionnée est dans un format qui n'est pas supporté par votre "
+"lecteur.\n"
"\n"
"Voulez vous continuer ?"
@@ -1211,7 +1252,8 @@
"\n"
"Do you want to proceed?"
msgstr ""
-"Aucune des pistes que vous avez sélectionnées ne sont supportées par votre lecteur.\n"
+"Aucune des pistes que vous avez sélectionnées ne sont supportées par votre "
+"lecteur.\n"
"\n"
"Voulez vous continuer ?"
@@ -1281,36 +1323,6 @@
msgid "_Abort"
msgstr "_Annuler"
-msgid "Success"
-msgstr "Succès"
-
-msgid "Memory allocation error"
-msgstr "Impossible d'allouer de la mémoire"
-
-msgid "Unable to open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-msgid "No metadata support for this format"
-msgstr "Pas de support des méta-données pour ce format"
-
-msgid "File is not writable"
-msgstr "Le fichier n'est pas accessible en écriture"
-
-msgid "Invalid 'Track no.' field value"
-msgstr "La valeur du champs 'No. de Piste' n'est pas valide"
-
-msgid "Invalid 'Genre' field value"
-msgstr "La valeur du champs 'Genre' n'est pas valide"
-
-msgid "Conversion to target charset failed"
-msgstr "La conversion vers le nouveau format d'encodage des caractères a échoué"
-
-msgid "Internal error"
-msgstr "Erreur interne"
-
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
msgid "Album"
msgstr "Album"
@@ -1605,6 +1617,37 @@
msgid "Unknown"
msgstr "Inconnu"
+msgid "Success"
+msgstr "Succès"
+
+msgid "Memory allocation error"
+msgstr "Impossible d'allouer de la mémoire"
+
+msgid "Unable to open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+msgid "No metadata support for this format"
+msgstr "Pas de support des méta-données pour ce format"
+
+msgid "File is not writable"
+msgstr "Le fichier n'est pas accessible en écriture"
+
+msgid "Invalid 'Track no.' field value"
+msgstr "La valeur du champs 'No. de Piste' n'est pas valide"
+
+msgid "Invalid 'Genre' field value"
+msgstr "La valeur du champs 'Genre' n'est pas valide"
+
+msgid "Conversion to target charset failed"
+msgstr ""
+"La conversion vers le nouveau format d'encodage des caractères a échoué"
+
+msgid "Internal error"
+msgstr "Erreur interne"
+
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
msgid "Other"
msgstr "Autre"
@@ -1697,7 +1740,8 @@
msgid ""
"You will need to restart Aqualung for the following changes to take effect:"
msgstr ""
-"Vous devez relancer Aqualung pour que les changements suivants prennent effet :"
+"Vous devez relancer Aqualung pour que les changements suivants prennent "
+"effet :"
msgid "Select a font..."
msgstr "Sélectionnez une police..."
@@ -1714,14 +1758,16 @@
msgid "unreachable"
msgstr "injoignable"
-msgid "Please select a Programable Title Format File."
+#, fuzzy
+msgid "Please select a Lua Extension File."
msgstr "Veuillez sélectionner un Fichier de Format de Titres Programmables."
msgid "Please select a Music Store database."
msgstr "Veuillez sélectionner une discothèque."
msgid "Paths must either be absolute or starting with a tilde."
-msgstr "Les chemins de fichiers doivent être soit absolus soit commencer avec ~"
+msgstr ""
+"Les chemins de fichiers doivent être soit absolus soit commencer avec ~"
msgid "The specified store has already been added to the list."
msgstr "La discothèque sélectionnée a déjà été ajoutée dans la liste."
@@ -1740,23 +1786,48 @@
msgid ""
"\n"
-"The file you enter/choose here will set the Lua program to use to format the "
-"title. See the Aqualung manual for details. Here is a quick example of what "
-"you can use in the file:\n"
+"If you have non-standard ID3v1/ID3v2 character encoding MPEG audio file, "
+"please enter suitable character encoding in this entry (see below). If this "
+"entry is blank, the standard character encoding (ISO-8859-1) is used.\n"
"\n"
+"For example:\n"
+" Japanese: CP932 (SHIFT_JIS variant)\n"
+" Korean: EUC-KR\n"
+" Simp. Chinese: GB2312\n"
+" Trad. Chinese: BIG5\n"
+" Greek: ISO-8859-7\n"
+" Hebrew: ISO-8859-8\n"
+" Cyrillic: CP1251\n"
+" Thai: ISO-8859-11\n"
+" Arabic: CP1256\n"
+" Turkish: ISO-8859-9\n"
+" Latin Extended: ISO-8859-2\n"
+" Central European: CP1250\n"
+" Latin1 (standard): ISO-8859-1\n"
+"\n"
+"NOTE: There might be a more suitable character encoding for your language."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"The file you enter/choose here will set the Lua program to use to extend "
+"Aqualung. See the Aqualung manual for details. Here is a quick example of "
+"what you can use in the file:\n"
+"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgstr ""
"\n"
-"Le fichier que vous choisissez ici représente le programme Lua à "
-"utiliser pour formater le titre. Consultez le manuel d'Aqualung pour les "
-"détails. Voici un exemple de ce que vous pouvez utiliser :\n"
+"Le fichier que vous choisissez ici représente le programme Lua à utiliser "
+"pour formater le titre. Consultez le manuel d'Aqualung pour les détails. "
+"Voici un exemple de ce que vous pouvez utiliser :\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgid ""
@@ -1812,8 +1883,7 @@
"Des vitesses basses signifient généralement moins de bruit. Cependant, en "
"utilisant les modes de corrections d'erreurs de Paranoia (pour plus de "
"précision); des vitesses beaucoup plus grandes sont souvent nécessaires pour "
-"éviter des tampons vides (et donc des moments de blanc audibles)."
-"\n"
+"éviter des tampons vides (et donc des moments de blanc audibles).\n"
"Veuillez noter que ces préférences ne s'appliquent pas lors de l'encodage de "
"CD-ROM, qui ont toujours lieu à la plus grande vitesse possible et avec les "
"modes de corrections d'erreurs choisis avant chaque encodage."
@@ -1893,6 +1963,12 @@
msgid "Command"
msgstr "Commande"
+msgid "Error in title format string"
+msgstr "Erreur dans la chaîne de caractères de formatage du titre"
+
+msgid "Error invalid character encoding"
+msgstr ""
+
msgid "Main window"
msgstr "Fenêtre Principale"
@@ -1911,8 +1987,8 @@
msgid "Title Format"
msgstr "Format du Titre"
-msgid "Programmable title format file"
-msgstr "Fichier du format de titre programmable"
+msgid "Lua extension file"
+msgstr ""
msgid "Systray"
msgstr "Zone de notification"
@@ -1969,12 +2045,17 @@
msgstr "Ne pas agrandir les images qui sont trop petites"
msgid "Show cover thumbnail for Music Store tracks only"
-msgstr "Montrer seulement une miniature de la couverture pour les pistes dans "
-"la Discothèque"
+msgstr ""
+"Montrer seulement une miniature de la couverture pour les pistes dans la "
+"Discothèque"
msgid "Don't show cover thumbnail in the main window"
-msgstr "Ne pas montrer la miniature de la couverture dans la fenêtre principale"
+msgstr ""
+"Ne pas montrer la miniature de la couverture dans la fenêtre principale"
+msgid "Use cover from external graphics file first"
+msgstr ""
+
msgid "Enable tooltips"
msgstr "Activer les info-bulles"
@@ -1988,8 +2069,9 @@
msgstr "Montrer les fichiers et les dossiers cachés"
msgid "Show tags tab first in the file info dialog"
-msgstr "Montrer l'onglet des étiquettes en premier dans la fenêtre "
-"d'information sur un fichier"
+msgstr ""
+"Montrer l'onglet des étiquettes en premier dans la fenêtre d'information sur "
+"un fichier"
msgid "Playlist"
msgstr "Liste de lecture"
@@ -2014,8 +2096,9 @@
# Trop merci quoi !
msgid "When shuffling, records added in Album mode are played in order"
-msgstr "Lorsque l'ordre de lecture est 'au hasard' les albums ajouté en mode "
-"'Album' sont joués dans l'ordre"
+msgstr ""
+"Lorsque l'ordre de lecture est 'au hasard' les albums ajouté en mode 'Album' "
+"sont joués dans l'ordre"
msgid "Enable statusbar"
msgstr "Activer la barre de status"
@@ -2128,7 +2211,8 @@
"Aqualung is compiled without Sample Rate Converter support.\n"
"See the About box and the documentation for details."
msgstr ""
-"Cet Aqualung a été généré sans le support de la Conversion du Taux d'Échantillonage.\n"
+"Cet Aqualung a été généré sans le support de la Conversion du Taux "
+"d'Échantillonage.\n"
"Consultez la fenêtre 'A propos' et la documentation pour plus de détails."
msgid "Playback RVA"
@@ -2182,7 +2266,8 @@
msgstr "% de la variance :"
msgid "ReplayGain tag to use (with fallback to the other): "
-msgstr "Étiquette ReplayGain à utiliser (se replier sur les autres au besoin) : "
+msgstr ""
+"Étiquette ReplayGain à utiliser (se replier sur les autres au besoin) : "
msgid "Replaygain_track_gain"
msgstr ""
@@ -2210,11 +2295,18 @@
"Lors de l'ajout de nouveaux cadres, essayer d'initialiser leurs contenus\n"
"avec le cadre d'une étiquette équivalente."
+msgid "MPEG audio ID3v1/ID3v2 character encoding"
+msgstr ""
+
msgid "Batch update & encode (mass tagger, CD ripper, file export)"
-msgstr "Mise à jour & encodage scripté (étiquettage en masse, encodage de CD, export de fichier)"
+msgstr ""
+"Mise à jour & encodage scripté (étiquettage en masse, encodage de CD, export "
+"de fichier)"
msgid "Tags to add when creating or updating MPEG audio files:"
-msgstr "Étiquettes à ajouter lors de la création ou la mise à jour de fichiers MPEG audio :"
+msgstr ""
+"Étiquettes à ajouter lors de la création ou la mise à jour de fichiers MPEG "
+"audio :"
msgid ""
"Note: pre-existing tags will be updated even though they\n"
@@ -2329,9 +2421,6 @@
msgid "Active song in playlist: "
msgstr "Chanson active dans la liste de lecture : "
-msgid "Error in title format string"
-msgstr "Erreur dans la chaîne de caractères de formatage du titre"
-
msgid "(Untitled)"
msgstr "(Sans titre)"
@@ -3116,8 +3205,9 @@
msgstr "Fin inattendue de la chaîne de caractères après '?'."
msgid "Expected '}' after '{', but end of string found."
-msgstr "'}' était attendu après '{', mais la fin de la chaîne de caractères "
-"a été trouvée."
+msgstr ""
+"'}' était attendu après '{', mais la fin de la chaîne de caractères a été "
+"trouvée."
#, c-format
msgid "Unknown conversion type character found after '%%'."
@@ -3135,7 +3225,8 @@
msgid "All Files"
msgstr "Tout les fichiers"
-msgid "Extended Title Format Files (*.lua)"
+#, fuzzy
+msgid "Lua Extension Files (*.lua)"
msgstr "Fichiers de Format de Titres Formatables (*.lua)"
msgid "Music Store Files (*.xml)"
@@ -3201,6 +3292,21 @@
msgid "Calculating volume level"
msgstr "Calcul du niveau de volume en cours"
+msgid "Compression: Fast"
+msgstr "Compression : Rapide"
+
+msgid "Compression: Normal"
+msgstr "Compression : Normale"
+
+msgid "Compression: High"
+msgstr "Compression : Élevée"
+
+msgid "Compression: Extra High"
+msgstr "Compression : Très Élevée"
+
+msgid "Compression: Insane"
+msgstr "Compression : Insensé"
+
msgid "Profile: Telephone"
msgstr "Profile : Téléphone"
@@ -3270,17 +3376,8 @@
msgid "encoding"
msgstr "encodage"
-msgid "Compression: Fast"
-msgstr "Compression : Rapide"
+#~ msgid "Lua (programmable title formatting) support\n"
+#~ msgstr "Support de Lua (for...
[truncated message content] |
|
From: <tsz...@us...> - 2015-07-26 19:11:43
|
Revision: 1310
http://sourceforge.net/p/aqualung/code/1310
Author: tszilagyi
Date: 2015-07-26 19:11:40 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
Fix use after free on CMD_FILEINFO (apply my patch from 2015-jan-5)
Modified Paths:
--------------
trunk/src/core.c
trunk/src/gui_main.c
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-09-01 19:24:59 UTC (rev 1309)
+++ trunk/src/core.c 2015-07-26 19:11:40 UTC (rev 1310)
@@ -373,7 +373,8 @@
(fdec->pdec != NULL)) {
decoder_t * dec = (decoder_t *)fdec->pdec;
-
+ fileinfo_t fileinfo_sent;
+
cdda_decoder_reopen(dec, filename);
fdec->samples_left = fdec->fileinfo.total_samples;
@@ -383,9 +384,11 @@
sample_offset = 0;
send_cmd = CMD_FILEINFO;
+ fileinfo_sent = fdec->fileinfo;
+ fileinfo_sent.format_str = strdup(fdec->fileinfo.format_str);
rb_write(rb_disk2gui, &send_cmd,
sizeof(send_cmd));
- rb_write(rb_disk2gui, (char *)&(fdec->fileinfo),
+ rb_write(rb_disk2gui, (char *)&fileinfo_sent,
sizeof(fileinfo_t));
info->is_streaming = 1;
@@ -412,6 +415,8 @@
rb_write(rb_disk2gui, &send_cmd, 1);
goto sleep;
} else {
+ fileinfo_t fileinfo_sent;
+
file_decoder_set_rva(fdec, cue.voladj);
info->in_SR_prev = info->in_SR;
info->in_SR = fdec->fileinfo.sample_rate;
@@ -431,9 +436,11 @@
sample_offset = 0;
send_cmd = CMD_FILEINFO;
+ fileinfo_sent = fdec->fileinfo;
+ fileinfo_sent.format_str = strdup(fdec->fileinfo.format_str);
rb_write(rb_disk2gui, &send_cmd,
sizeof(send_cmd));
- rb_write(rb_disk2gui, (char *)&(fdec->fileinfo),
+ rb_write(rb_disk2gui, (char *)&fileinfo_sent,
sizeof(fileinfo_t));
info->is_streaming = 1;
Modified: trunk/src/gui_main.c
===================================================================
--- trunk/src/gui_main.c 2014-09-01 19:24:59 UTC (rev 1309)
+++ trunk/src/gui_main.c 2015-07-26 19:11:40 UTC (rev 1310)
@@ -3974,6 +3974,10 @@
case CMD_FILEINFO:
while (rb_read_space(rb_disk2gui) < sizeof(fileinfo_t))
;
+ if (fileinfo.format_str != NULL) { /* free previous format_str, if there is one */
+ free(fileinfo.format_str);
+ fileinfo.format_str = NULL;
+ }
rb_read(rb_disk2gui, (char *)&fileinfo, sizeof(fileinfo_t));
sample_pos = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-09-01 19:25:03
|
Revision: 1309
http://sourceforge.net/p/aqualung/code/1309
Author: tszilagyi
Date: 2014-09-01 19:24:59 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
Add updated German translation from Wolfgang Stoeggl
Modified Paths:
--------------
trunk/po/de.po
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2014-08-25 15:29:39 UTC (rev 1308)
+++ trunk/po/de.po 2014-09-01 19:24:59 UTC (rev 1309)
@@ -3,82 +3,23 @@
# Copyright (C) 2004 Tom Szilagyi
# This file is distributed under the same license as the aqualung package.
# Philipp Überbacher <hol...@gm...>, 2007, 2008.
-# Wolfgang Stöggl <c7...@ya...>, 2007-2010.
+# Wolfgang Stöggl <c7...@ya...>, 2007-2010, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 00:15+0100\n"
-"PO-Revision-Date: 2010-01-13 00:16+0100\n"
+"Project-Id-Version: aqualung SVN\n"
+"Report-Msgid-Bugs-To: aqu...@li...\n"
+"POT-Creation-Date: 2014-08-31 13:49+0200\n"
+"PO-Revision-Date: 2014-08-31 21:13+0100\n"
"Last-Translator: Wolfgang Stoeggl <c7...@ya...>\n"
"Language-Team: German <de...@li...>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
+"X-Generator: Poedit 1.6.9\n"
-msgid "About"
-msgstr "Über Aqualung"
-
-msgid "Build version: "
-msgstr "Version: "
-
-msgid "Homepage:"
-msgstr "Webseite:"
-
-msgid "Authors:"
-msgstr "Autoren:"
-
-msgid "Core design, engineering & programming:\n"
-msgstr "Kernentwurf, technische Planung & Programmierung:\n"
-
-msgid "Skin support, look & feel, GUI hacks:\n"
-msgstr "Oberfläche, Aussehen, Handhabung:\n"
-
-msgid "Programming, GUI engineering:\n"
-msgstr "Programmierung, GUI-Planung:\n"
-
-msgid "OpenBSD compatibility, metadata tweaks:\n"
-msgstr "OpenBSD-Kompatibilität, Metadaten-Kniffe:\n"
-
-msgid "Translators:"
-msgstr "Übersetzer:"
-
-msgid "French:\n"
-msgstr "Französisch:\n"
-
-msgid "German:\n"
-msgstr "Deutsch:\n"
-
-msgid "Hungarian:\n"
-msgstr "Ungarisch:\n"
-
-msgid "Italian:\n"
-msgstr "Italienisch:\n"
-
-msgid "Japanese:\n"
-msgstr "Japanisch:\n"
-
-msgid "Russian:\n"
-msgstr "Russisch:\n"
-
-msgid "Swedish:\n"
-msgstr "Schwedisch:\n"
-
-msgid "Ukrainian:\n"
-msgstr "Ukrainisch:\n"
-
-msgid "Graphics:"
-msgstr "Graphiken:"
-
-msgid "Logo, icons:\n"
-msgstr "Logo, Symbole:\n"
-
-msgid "This Aqualung binary is compiled with:"
-msgstr "Diese Aqualung-Binärdatei wurde kompiliert mit:"
-
msgid "Optional features:"
msgstr "Optionale Funktionen:"
@@ -97,6 +38,9 @@
msgid "iRiver iFP driver support\n"
msgstr "iRiver iFP Treiberunterstützung\n"
+msgid "JACK port management support\n"
+msgstr "Unterstützung für JACK Port-Verwaltung\n"
+
msgid "Loop playback support\n"
msgstr "Schleifenwiedergabe\n"
@@ -106,8 +50,8 @@
msgid "Podcast support\n"
msgstr "Podcast\n"
-msgid "Lua (programmable title formatting) support\n"
-msgstr "Lua-Unterstützung (programmierbare Titelformatierung)\n"
+msgid "Lua extension support\n"
+msgstr "Unterstützung für Lua-Erweiterungen\n"
msgid "Decoding support:"
msgstr "Dekodierbare Dateiformate:"
@@ -172,6 +116,84 @@
msgid "Win32 Sound API\n"
msgstr "Win32 Sound API\n"
+msgid "About"
+msgstr "Über Aqualung"
+
+msgid "Build version: "
+msgstr "Version: "
+
+msgid "Homepage:"
+msgstr "Webseite:"
+
+msgid "Authors:"
+msgstr "Autoren:"
+
+msgid "Core design, engineering & programming:\n"
+msgstr "Kernentwurf, technische Planung & Programmierung:\n"
+
+msgid "Skin support, look & feel, GUI hacks:\n"
+msgstr "Oberfläche, Aussehen, Handhabung:\n"
+
+msgid "Programming, GUI engineering:\n"
+msgstr "Programmierung, GUI-Planung:\n"
+
+msgid "OpenBSD compatibility, metadata tweaks:\n"
+msgstr "OpenBSD-Kompatibilität, Metadaten-Kniffe:\n"
+
+msgid "Miscellaneous, minimalism:\n"
+msgstr "Verschiedenes, Minimalismus:\n"
+
+msgid "Translators:"
+msgstr "Übersetzer:"
+
+msgid "Chinese (simplified):\n"
+msgstr "Chinesisch, vereinfacht:\n"
+
+msgid "Czech:\n"
+msgstr "Tschechisch:\n"
+
+msgid "Dutch:\n"
+msgstr "Niederländisch:\n"
+
+msgid "French:\n"
+msgstr "Französisch:\n"
+
+msgid "German:\n"
+msgstr "Deutsch:\n"
+
+msgid "Hungarian:\n"
+msgstr "Ungarisch:\n"
+
+msgid "Italian:\n"
+msgstr "Italienisch:\n"
+
+msgid "Japanese:\n"
+msgstr "Japanisch:\n"
+
+msgid "Polish:\n"
+msgstr "Polnisch:\n"
+
+msgid "Russian:\n"
+msgstr "Russisch:\n"
+
+msgid "Spanish:\n"
+msgstr "Spanisch:\n"
+
+msgid "Swedish:\n"
+msgstr "Schwedisch:\n"
+
+msgid "Ukrainian:\n"
+msgstr "Ukrainisch:\n"
+
+msgid "Graphics:"
+msgstr "Graphiken:"
+
+msgid "Logo, icons:\n"
+msgstr "Logo, Symbole:\n"
+
+msgid "This Aqualung binary is compiled with:"
+msgstr "Diese Aqualung-Binärdatei wurde kompiliert mit:"
+
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -427,126 +449,6 @@
msgid "Removing non-existing files"
msgstr "Entferne nicht vorhandene Dateien"
-msgid "Unknown disc"
-msgstr "Unbekannte CD"
-
-msgid "No disc"
-msgstr "Keine CD"
-
-msgid "CDDB query"
-msgstr "CDDB-Abfrage"
-
-msgid "Retrieving matches from server..."
-msgstr "Empfange Treffer vom Server …"
-
-msgid "Connecting to CDDB server..."
-msgstr "Verbinde zum CDDB-Server …"
-
-msgid "Error"
-msgstr "Fehler"
-
-msgid "An error occurred while attempting to connect to the CDDB server."
-msgstr "Während des Versuchs zum CDDB-Server zu verbinden trat ein Fehler auf."
-
-msgid "Warning"
-msgstr "Warnung"
-
-msgid "No matching record found."
-msgstr "Kein passendes Album gefunden."
-
-msgid "Import as Sort Key"
-msgstr "Als Sortierschlüssel importieren"
-
-msgid "Import as Title"
-msgstr "Als Titel importieren"
-
-msgid "Import as Year"
-msgstr "Als Jahr importieren"
-
-msgid ""
-"Artist appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Der Name des Interpreten scheint in Kleinbuchstaben zu sein.\n"
-"Möchten Sie fortsetzen?"
-
-msgid ""
-"Artist appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Der Name des Interpreten scheint in Großbuchstaben zu sein.\n"
-"Möchten Sie fortsetzen?"
-
-msgid ""
-"Title appears to be in all lowercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Der Titel scheint in Kleinbuchstaben zu sein.\n"
-"Möchten Sie fortsetzen?"
-
-msgid ""
-"Title appears to be in all uppercase.\n"
-"Do you want to proceed?"
-msgstr ""
-"Der Titel scheint in Großbuchstaben zu sein.\n"
-"Möchten Sie fortsetzen?"
-
-msgid ""
-"It is very likely that the year is wrong.\n"
-"Do you want to proceed?"
-msgstr ""
-"Es ist sehr wahrscheinlich, dass das Jahr falsch ist.\n"
-"Möchten Sie fortsetzen?"
-
-msgid "The email address provided for submission is invalid."
-msgstr "Die für die Übertragung eingegebene E-Mail-Adresse ist ungültig."
-
-msgid "An error occurred while submitting the record to the CDDB server."
-msgstr ""
-"Während der Übertragung des Albums zum CDDB-Server trat ein Fehler auf."
-
-msgid "Correct existing record"
-msgstr "Bestehenden Eintrag korrigieren"
-
-msgid "Submit new record"
-msgstr "Neuen Eintrag hinzufügen"
-
-msgid "Matches:"
-msgstr "Treffer:"
-
-msgid "Artist:"
-msgstr "Interpret:"
-
-msgid "Title:"
-msgstr "Titel:"
-
-msgid "Year:"
-msgstr "Jahr:"
-
-msgid "Category:"
-msgstr "Kategorie:"
-
-msgid "(choose a category)"
-msgstr "(Wählen Sie eine Kategorie)"
-
-msgid "Genre:"
-msgstr "Genre:"
-
-msgid "Extended data:"
-msgstr "Erweiterte Daten:"
-
-msgid "Import as Artist"
-msgstr "Als Interpret importieren"
-
-msgid "Add to Comments"
-msgstr "Zu den Kommentaren hinzufügen"
-
-msgid "Tracks"
-msgstr "Titel"
-
-msgid "You have to provide an email address for CDDB submission."
-msgstr "Für die CDDB-Übertragung müssen Sie eine E-Mail-Adresse angeben."
-
msgid "Please select the directory for ripped files."
msgstr "Bitte wählen Sie einen Order für die eingelesenen Dateien aus."
@@ -586,9 +488,18 @@
msgid "Rip CD"
msgstr "CD auslesen"
+msgid "Artist:"
+msgstr "Interpret:"
+
msgid "Album:"
msgstr "Album:"
+msgid "Year:"
+msgstr "Jahr:"
+
+msgid "Genre:"
+msgstr "Genre:"
+
msgid "Rip"
msgstr "Auslesen"
@@ -650,6 +561,9 @@
msgid "Maximum number of retries:"
msgstr "Maximale Anzahl der Wiederholungen:"
+msgid "Error"
+msgstr "Fehler"
+
msgid ""
"\n"
"Destination directory is not read-write accessible!"
@@ -681,6 +595,114 @@
msgid "Close"
msgstr "Schließen"
+msgid "Unknown disc"
+msgstr "Unbekannte CD"
+
+msgid "No disc"
+msgstr "Keine CD"
+
+msgid "CDDB query"
+msgstr "CDDB-Abfrage"
+
+msgid "Retrieving matches from server..."
+msgstr "Empfange Treffer vom Server …"
+
+msgid "Connecting to CDDB server..."
+msgstr "Verbinde zum CDDB-Server …"
+
+msgid "An error occurred while attempting to connect to the CDDB server."
+msgstr "Während des Versuchs zum CDDB-Server zu verbinden trat ein Fehler auf."
+
+msgid "Warning"
+msgstr "Warnung"
+
+msgid "No matching record found."
+msgstr "Kein passendes Album gefunden."
+
+msgid "Import as Sort Key"
+msgstr "Als Sortierschlüssel importieren"
+
+msgid "Import as Title"
+msgstr "Als Titel importieren"
+
+msgid "Import as Year"
+msgstr "Als Jahr importieren"
+
+msgid ""
+"Artist appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Der Name des Interpreten scheint in Kleinbuchstaben zu sein.\n"
+"Möchten Sie fortsetzen?"
+
+msgid ""
+"Artist appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Der Name des Interpreten scheint in Großbuchstaben zu sein.\n"
+"Möchten Sie fortsetzen?"
+
+msgid ""
+"Title appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Der Titel scheint in Kleinbuchstaben zu sein.\n"
+"Möchten Sie fortsetzen?"
+
+msgid ""
+"Title appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+"Der Titel scheint in Großbuchstaben zu sein.\n"
+"Möchten Sie fortsetzen?"
+
+msgid ""
+"It is very likely that the year is wrong.\n"
+"Do you want to proceed?"
+msgstr ""
+"Es ist sehr wahrscheinlich, dass das Jahr falsch ist.\n"
+"Möchten Sie fortsetzen?"
+
+msgid "The email address provided for submission is invalid."
+msgstr "Die für die Übertragung eingegebene E-Mail-Adresse ist ungültig."
+
+msgid "An error occurred while submitting the record to the CDDB server."
+msgstr ""
+"Während der Übertragung des Albums zum CDDB-Server trat ein Fehler auf."
+
+msgid "Correct existing record"
+msgstr "Bestehenden Eintrag korrigieren"
+
+msgid "Submit new record"
+msgstr "Neuen Eintrag hinzufügen"
+
+msgid "Matches:"
+msgstr "Treffer:"
+
+msgid "Title:"
+msgstr "Titel:"
+
+msgid "Category:"
+msgstr "Kategorie:"
+
+msgid "(choose a category)"
+msgstr "(Wählen Sie eine Kategorie)"
+
+msgid "Extended data:"
+msgstr "Erweiterte Daten:"
+
+msgid "Import as Artist"
+msgstr "Als Interpret importieren"
+
+msgid "Add to Comments"
+msgstr "Zu den Kommentaren hinzufügen"
+
+msgid "Tracks"
+msgstr "Titel"
+
+msgid "You have to provide an email address for CDDB submission."
+msgstr "Für die CDDB-Übertragung müssen Sie eine E-Mail-Adresse angeben."
+
msgid "Unknown Album"
msgstr "Unbekanntes Album"
@@ -700,18 +722,34 @@
msgid ""
"\n"
"The template string you enter here will be used to construct the filename of "
-"the exported files. The Artist, Record and Track names are denoted by %%a, "
-"%%r and %%t. The track number and format-dependent file extension are "
-"denoted by %%n and %%x, respectively. The flag %%i gives an identifier "
-"which is unique within an export session."
+"the exported files. The Original filename, Artist, Record and Track names "
+"are denoted by %%o, %%a, %%r and %%t. The track number and format-dependent "
+"file extension are denoted by %%n and %%x, respectively. %%i gives an "
+"identifier which is unique within an export session."
msgstr ""
"\n"
"Diese Vorlage-Zeichenkette wird für die Konstruktion eines Dateinamens für "
-"die zu exportierenden Dateien benutzt. Interpret, Album und Titelnamen "
-"werden mit %%a, %%r und %%t bezeichnet. Die Titelnummer und "
-"formatabhängige Dateiendung werden mit %%n und %%x bezeichnet. Das Flag "
-"%%i ist eine Bezeichnung, die innerhalb einer Exportsitzung einmalig ist."
+"die zu exportierenden Dateien benutzt. Ursprünglicher Dateiname, Interpret, "
+"Album und Titelnamen werden mit %%o, %%a, %%r und %%t bezeichnet. Die "
+"Titelnummer und formatabhängige Dateiendung werden mit %%n und %%x "
+"bezeichnet. Das Flag %%i ist eine Bezeichnung, die innerhalb einer "
+"Exportsitzung einmalig ist."
+msgid "Exporting files"
+msgstr "Dateien werden exportiert"
+
+msgid "Source file:"
+msgstr "Quelldatei:"
+
+msgid "Target file:"
+msgstr "Zieldatei:"
+
+msgid "Progress:"
+msgstr "Fortschritt:"
+
+msgid "Error in format string"
+msgstr "Fehler in der Formatierungs-Zeichenkette"
+
msgid "Export files"
msgstr "Dateien exportieren"
@@ -750,21 +788,6 @@
"Dateien nicht neu kodieren,\n"
"die der Maske entsprechen:"
-msgid "Error in format string"
-msgstr "Fehler in der Formatierungs-Zeichenkette"
-
-msgid "Exporting files"
-msgstr "Dateien werden exportiert"
-
-msgid "Source file:"
-msgstr "Quelldatei:"
-
-msgid "Target file:"
-msgstr "Zieldatei:"
-
-msgid "Progress:"
-msgstr "Fortschritt:"
-
msgid "*File info"
msgstr "*Datei-Info"
@@ -871,6 +894,16 @@
msgid "tag:"
msgstr "Tag:"
+#, c-format
+msgid "%ld Hz"
+msgstr "%ld Hz"
+
+msgid "MONO"
+msgstr "MONO"
+
+msgid "STEREO"
+msgstr "STEREO"
+
msgid "Audio CD"
msgstr "Audio-CD"
@@ -892,19 +925,9 @@
msgid "Samplerate:"
msgstr "Samplerate:"
-#, c-format
-msgid "%ld Hz"
-msgstr "%ld Hz"
-
msgid "Channel count:"
msgstr "Kanalanzahl:"
-msgid "MONO"
-msgstr "MONO"
-
-msgid "STEREO"
-msgstr "STEREO"
-
msgid "Bandwidth:"
msgstr "Bandbreite:"
@@ -1006,12 +1029,10 @@
msgid "JACK connection lost"
msgstr "JACK-Verbindung verloren"
-msgid ""
-"JACK has either been shutdown or it disconnected Aqualung because it was not "
-"fast enough. All you can do now is restart both JACK and Aqualung."
+#, c-format
+msgid "JACK has either been shutdown or it disconnected Aqualung. Reason: %s"
msgstr ""
-"JACK wurde entweder beendet oder es hat Aqualung abgekoppelt weil Aqualung "
-"nicht schnell genug war. JACK und Aqualung sollten neu gestartet werden."
+"JACK wurde entweder beendet oder es hat Aqualung abgekoppelt. Ursache: %s"
msgid "Warn me if the Window Manager does not support system tray"
msgstr "Warnen, falls der Fenstermanager keine Kontrollleiste unterstützt"
@@ -1285,36 +1306,6 @@
msgid "_Abort"
msgstr "_Abbrechen"
-msgid "Success"
-msgstr "Erfolgreich"
-
-msgid "Memory allocation error"
-msgstr "Speicherzuordnungsfehler"
-
-msgid "Unable to open file"
-msgstr "Außerstande Datei zu öffnen"
-
-msgid "No metadata support for this format"
-msgstr "Keine Metadatenunterstützung für dieses Format"
-
-msgid "File is not writable"
-msgstr "Datei ist nicht beschreibbar"
-
-msgid "Invalid 'Track no.' field value"
-msgstr "Ungültiger Wert im Feld »Titelnummer«"
-
-msgid "Invalid 'Genre' field value"
-msgstr "Ungültiger Wert im Feld »Genre«"
-
-msgid "Conversion to target charset failed"
-msgstr "Konvertierung zur Ziel-Charakterkodierung fehlgeschlagen"
-
-msgid "Internal error"
-msgstr "Interner Fehler"
-
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
msgid "Album"
msgstr "Album"
@@ -1609,6 +1600,36 @@
msgid "Unknown"
msgstr "Unbekannt"
+msgid "Success"
+msgstr "Erfolgreich"
+
+msgid "Memory allocation error"
+msgstr "Speicherzuordnungsfehler"
+
+msgid "Unable to open file"
+msgstr "Außerstande Datei zu öffnen"
+
+msgid "No metadata support for this format"
+msgstr "Keine Metadatenunterstützung für dieses Format"
+
+msgid "File is not writable"
+msgstr "Datei ist nicht beschreibbar"
+
+msgid "Invalid 'Track no.' field value"
+msgstr "Ungültiger Wert im Feld »Titelnummer«"
+
+msgid "Invalid 'Genre' field value"
+msgstr "Ungültiger Wert im Feld »Genre«"
+
+msgid "Conversion to target charset failed"
+msgstr "Konvertierung zur Ziel-Charakterkodierung fehlgeschlagen"
+
+msgid "Internal error"
+msgstr "Interner Fehler"
+
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
msgid "Other"
msgstr "Andere"
@@ -1720,8 +1741,8 @@
msgid "unreachable"
msgstr "nicht erreichbar"
-msgid "Please select a Programable Title Format File."
-msgstr "Bitte wählen Sie eine programmierbare Titelformatdatei."
+msgid "Please select a Lua Extension File."
+msgstr "Bitte wählen Sie eine Lua-Erweiterungsdatei."
msgid "Please select a Music Store database."
msgstr "Bitte wähle Sie eine Musiksammlungsdatenbank."
@@ -1746,23 +1767,70 @@
msgid ""
"\n"
-"The file you enter/choose here will set the Lua program to use to format the "
-"title. See the Aqualung manual for details. Here is a quick example of what "
-"you can use in the file:\n"
+"If you have non-standard ID3v1/ID3v2 character encoding MPEG audio file, "
+"please enter suitable character encoding in this entry (see below). If this "
+"entry is blank, the standard character encoding (ISO-8859-1) is used.\n"
"\n"
+"For example:\n"
+" Japanese: CP932 (SHIFT_JIS variant)\n"
+" Korean: EUC-KR\n"
+" Simp. Chinese: GB2312\n"
+" Trad. Chinese: BIG5\n"
+" Greek: ISO-8859-7\n"
+" Hebrew: ISO-8859-8\n"
+" Cyrillic: CP1251\n"
+" Thai: ISO-8859-11\n"
+" Arabic: CP1256\n"
+" Turkish: ISO-8859-9\n"
+" Latin Extended: ISO-8859-2\n"
+" Central European: CP1250\n"
+" Latin1 (standard): ISO-8859-1\n"
+"\n"
+"NOTE: There might be a more suitable character encoding for your language."
+msgstr ""
+"\n"
+"Falls Sie eine MPEG-Audiodatei mit nicht Standard ID3v1/ID3v2 "
+"Zeichenkodierung haben, so wählen Sie bitte eine passende Zeichenkodierung "
+"in diesem Eintrag (siehe unten). Falls dieser Eintrag leer ist, wird die "
+"Standard-Zeichenkodierung (ISO-8859-1) verwendet.\n"
+"\n"
+"Zum Beispiel:\n"
+" Japanisch: CP932 (SHIFT_JIS variant)\n"
+" Koreanisch: EUC-KR\n"
+" Chinesisch, vereinfacht: GB2312\n"
+" Chinesisch, trad.: BIG5\n"
+" Griechisch: ISO-8859-7\n"
+" Hebräisch: ISO-8859-8\n"
+" Kyrillisch: CP1251\n"
+" Thai: ISO-8859-11\n"
+" Arabisch: CP1256\n"
+" Türkisch: ISO-8859-9\n"
+" Latin-2 (erweitert): ISO-8859-2\n"
+" Mitteleuropäisch: CP1250\n"
+" Latin-1 (Standard): ISO-8859-1\n"
+"\n"
+"Beachten Sie: Für Ihre Sprache könnte es eine besser passende Kodierung "
+"geben."
+
+msgid ""
+"\n"
+"The file you enter/choose here will set the Lua program to use to extend "
+"Aqualung. See the Aqualung manual for details. Here is a quick example of "
+"what you can use in the file:\n"
+"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgstr ""
"\n"
"Die Datei, die Sie hier eingeben oder auswählen, wird von Lua verwendet, um "
-"den Titel zu formatieren. Weitere Details findet man im Aqualung-Handbuch. "
-"Hier ist ein kurzes Beispiel dafür, was in der Datei verwendet werden kann:\n"
+"Aqualung zu erweitern. Weitere Details findet man im Aqualung-Handbuch. Hier "
+"ist ein kurzes Beispiel dafür, was in der Datei verwendet werden kann:\n"
"\n"
"function playlist_title()\n"
-" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
-"('filename') .. ')'\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. "
+"i('filename') .. ')'\n"
"end"
msgid ""
@@ -1902,6 +1970,12 @@
msgid "Command"
msgstr "Befehl"
+msgid "Error in title format string"
+msgstr "Fehler in der Titelformat-Zeichenkette"
+
+msgid "Error invalid character encoding"
+msgstr "Fehler, ungültige Zeichenkodierung"
+
msgid "Main window"
msgstr "Hauptfenster"
@@ -1920,8 +1994,8 @@
msgid "Title Format"
msgstr "Titelformat"
-msgid "Programmable title format file"
-msgstr "Programmierbare Titelformatdatei"
+msgid "Lua extension file"
+msgstr "Lua-Erweiterungsdatei"
msgid "Systray"
msgstr "Kontrollleiste"
@@ -1983,6 +2057,9 @@
msgid "Don't show cover thumbnail in the main window"
msgstr "Miniatur-Coverbild nicht im Hauptfenster anzeigen"
+msgid "Use cover from external graphics file first"
+msgstr "Cover aus externer Grafikdatei zuerst verwenden"
+
msgid "Enable tooltips"
msgstr "Minihilfen einschalten"
@@ -2217,6 +2294,9 @@
"Wenn neue Frames hinzugefügt werden, versuchen ihre Inhalte\n"
"aus dem äquivalenten Frame eines anderen Tags zu setzen."
+msgid "MPEG audio ID3v1/ID3v2 character encoding"
+msgstr "MPEG-Audio ID3v1/ID3v2 Zeichenkodierung"
+
msgid "Batch update & encode (mass tagger, CD ripper, file export)"
msgstr ""
"Stapelweise aktualisieren und kodieren (Mass-Tagger, CD-Ausleser, "
@@ -2342,9 +2422,6 @@
msgid "Active song in playlist: "
msgstr "Aktiver Titel in der Playliste: "
-msgid "Error in title format string"
-msgstr "Fehler in der Titelformat-Zeichenkette"
-
msgid "(Untitled)"
msgstr "(Unbetitelt)"
@@ -3151,8 +3228,8 @@
msgid "All Files"
msgstr "Alle Dateien"
-msgid "Extended Title Format Files (*.lua)"
-msgstr "Erweiterte Titelformatdateien (*.lua)"
+msgid "Lua Extension Files (*.lua)"
+msgstr "Lua-Erweiterungsdateien (*.lua)"
msgid "Music Store Files (*.xml)"
msgstr "Musiksammlungsdateien (*.xml)"
@@ -3217,8 +3294,23 @@
msgid "Calculating volume level"
msgstr "Lautstärke wird gemessen"
+msgid "Compression: Fast"
+msgstr "Kompression: Schnell"
+
+msgid "Compression: Normal"
+msgstr "Kompression: Normal"
+
+msgid "Compression: High"
+msgstr "Kompression: Hoch"
+
+msgid "Compression: Extra High"
+msgstr "Kompression: Extra Hoch"
+
+msgid "Compression: Insane"
+msgstr "Kompression: Wahnsinnig"
+
msgid "Profile: Telephone"
-msgstr "Profil: Telephon"
+msgstr "Profil: Telefon"
msgid "Profile: Thumb"
msgstr "Profil: Daumen"
@@ -3286,17 +3378,8 @@
msgid "encoding"
msgstr "Kodierung"
-msgid "Compression: Fast"
-msgstr "Kompression: Schnell"
+#~ msgid "Lua (programmable title formatting) support\n"
+#~ msgstr "Lua-Unterstützung (programmierbare Titelformatierung)\n"
-msgid "Compression: Normal"
-msgstr "Kompression: Normal"
-
-msgid "Compression: High"
-msgstr "Kompression: Hoch"
-
-msgid "Compression: Extra High"
-msgstr "Kompression: Extra Hoch"
-
-msgid "Compression: Insane"
-msgstr "Kompression: Wahnsinnig"
+#~ msgid "Programmable title format file"
+#~ msgstr "Programmierbare Titelformatdatei"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-08-25 15:29:47
|
Revision: 1308
http://sourceforge.net/p/aqualung/code/1308
Author: tszilagyi
Date: 2014-08-25 15:29:39 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Support XDG Basedir specification
Implement feature request #192
http://aqualung.factorial.hu/mantis/bug_view_page.php?bug_id=0000192
Having all configuation in one subdirectory makes backups much easier
and declutters the home directory. The implementation auto-migrates
~/.aqualung (if it exists) to $XDG_CONFIG_HOME/aqualung (most likely
~/.config/aqualung) and uses the new location going forward.
Compatibility with the legacy location is thus ensured.
Modified Paths:
--------------
trunk/doc/aqualung-doc.xml
trunk/doc/aqualung.1
trunk/src/core.c
Modified: trunk/doc/aqualung-doc.xml
===================================================================
--- trunk/doc/aqualung-doc.xml 2014-08-22 12:31:51 UTC (rev 1307)
+++ trunk/doc/aqualung-doc.xml 2014-08-25 15:29:39 UTC (rev 1308)
@@ -719,33 +719,44 @@
<dl man="FILES">
<dt>
- <file>~/.aqualung</file>
+ <file>$XDG_CONFIG_HOME/aqualung/</file>
</dt>
- <dd>Directory containing user settings.</dd>
+ <dd>Directory containing user settings. $XDG_CONFIG_HOME is
+ the user-specific directory for application configuration
+ information according to the XDG Base Directory Specification.
+ It is most likely equivalent to ~/.config, so the following
+ config files (except the last one, which resides in a
+ system-wide location) are usually found under
+ $HOME/.config/aqualung/</dd>
+ <dd>Note: earlier versions of Aqualung kept these per-user
+ configuration files in ~/.aqualung. This legacy setup is
+ recognized and silently migrated to the XDG-conformant
+ layout.</dd>
+
<dt>
- <file>~/.aqualung/config.xml</file>
+ <file>config.xml</file>
</dt>
<dd>GUI (skin, window size/position, etc.) and other
settings.</dd>
<dt>
- <file>~/.aqualung/plugin.xml</file>
+ <file>plugin.xml</file>
</dt>
<dd>List of running plugins and all their settings.</dd>
<dt>
- <file>~/.aqualung/playlist.xml</file>
+ <file>playlist.xml</file>
</dt>
<dd>Automatically saved and restored playlist (if you enable
this feature).</dd>
<dt>
- <file>~/.aqualung/<skin-name></file>
+ <file><skin-name></file>
</dt>
<dd>Locally available skin <skin-name> (useful for
@@ -2505,8 +2516,9 @@
and there is no way to override that from the command line. If
you get into trouble, all you have to (or can) do is grab a
text editor and hack it out of
- <file>~/.aqualung/config.xml</file> where it is stored. You
- will find it between <q><default_param></q> and
+ <file>$XDG_CONFIG_HOME/aqualung/config.xml</file> where it is
+ stored (note that $XDG_CONFIG_HOME is most likely ~/.config).
+ You will find it between <q><default_param></q> and
<q></default_param></q>.</p>
<p>There are also some options to handle the display of album
Modified: trunk/doc/aqualung.1
===================================================================
--- trunk/doc/aqualung.1 2014-08-22 12:31:51 UTC (rev 1307)
+++ trunk/doc/aqualung.1 2014-08-25 15:29:39 UTC (rev 1308)
@@ -1,4 +1,4 @@
-.TH AQUALUNG 1 "22 October 2012"
+.TH AQUALUNG 1 "25 August 2014"
.SH NAME
aqualung \- Music player for GNU/Linux
.SH SYNOPSIS
@@ -339,25 +339,36 @@
Here is a list of files that Aqualung creates, reads and
relies on.
.TP
-~/.aqualung
+$XDG_CONFIG_HOME/aqualung/
.br
-Directory containing user settings.
+Directory containing user settings. $XDG_CONFIG_HOME is
+the user-specific directory for application configuration
+information according to the XDG Base Directory Specification.
+It is most likely equivalent to ~/.config, so the following
+config files (except the last one, which resides in a
+system-wide location) are usually found under
+$HOME/.config/aqualung/
+.br
+Note: earlier versions of Aqualung kept these per-user
+configuration files in ~/.aqualung. This legacy setup is
+recognized and silently migrated to the XDG-conformant
+layout.
.TP
-~/.aqualung/config.xml
+config.xml
.br
GUI (skin, window size/position, etc.) and other
settings.
.TP
-~/.aqualung/plugin.xml
+plugin.xml
.br
List of running plugins and all their settings.
.TP
-~/.aqualung/playlist.xml
+playlist.xml
.br
Automatically saved and restored playlist (if you enable
this feature).
.TP
-~/.aqualung/<skin-name>
+<skin-name>
.br
Locally available skin <skin-name> (useful for
skin development).
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-08-22 12:31:51 UTC (rev 1307)
+++ trunk/src/core.c 2014-08-25 15:29:39 UTC (rev 1308)
@@ -32,6 +32,7 @@
#include <getopt.h>
#include <sys/stat.h>
#include <glib.h>
+#include <glib/gstdio.h>
#include <gdk/gdk.h>
#include <libxml/globals.h>
#include <libxml/parser.h>
@@ -2327,6 +2328,7 @@
setup_app_directories(void) {
char * home = getenv("HOME");
+ char * xdgconfdir;
if (!home) {
char * homedir = (char *)g_get_home_dir();
strcpy(options.home, homedir);
@@ -2336,6 +2338,20 @@
}
snprintf(options.confdir, MAXLEN-1, "%s/.aqualung", options.home);
+ xdgconfdir = g_build_filename(g_get_user_config_dir(), "aqualung", NULL);
+ if (!g_file_test(xdgconfdir, G_FILE_TEST_IS_DIR) &&
+ g_file_test(options.confdir, G_FILE_TEST_IS_DIR)) {
+ printf("Moving configuration directory\n"
+ " from legacy path: %s\n"
+ " to XDG-conform path: %s\n",
+ options.confdir, xdgconfdir);
+ if (g_rename(options.confdir, xdgconfdir) != 0) {
+ perror("Error: rename");
+ exit(1);
+ }
+ }
+ strncpy(options.confdir, xdgconfdir, MAXLEN-1);
+ g_free(xdgconfdir);
strcpy(options.audiodir, options.home);
strcpy(options.currdir, options.home);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-08-22 12:31:54
|
Revision: 1307
http://sourceforge.net/p/aqualung/code/1307
Author: tszilagyi
Date: 2014-08-22 12:31:51 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
Updated cs.po from Pavel Fric
Modified Paths:
--------------
trunk/po/cs.po
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2014-08-19 14:26:54 UTC (rev 1306)
+++ trunk/po/cs.po 2014-08-22 12:31:51 UTC (rev 1307)
@@ -7,7 +7,7 @@
"Project-Id-Version: aqualung SVN\n"
"Report-Msgid-Bugs-To: aqu...@li...\n"
"POT-Creation-Date: 2014-08-14 20:42+0200\n"
-"PO-Revision-Date: 2014-08-16 15:40+0200\n"
+"PO-Revision-Date: 2014-08-21 22:51+0200\n"
"Last-Translator: Pavel Fric <pav...@se...>\n"
"Language-Team: Czech <tra...@li...>\n"
"Language: cs\n"
@@ -1695,10 +1695,10 @@
msgstr "Odstranit položku..."
msgid "Save all stores"
-msgstr "Uložit všechny obchody"
+msgstr "Uložit všechny sbírky"
msgid "Create empty store..."
-msgstr "Vytvořit prázdný obchod..."
+msgstr "Vytvořit prázdnou sbírku..."
msgid "*Music Store"
msgstr "*Sbírka desek"
@@ -1970,7 +1970,7 @@
msgstr "Hlavní okno"
msgid "Disable control buttons relief"
-msgstr "Vypnout u ovládacích tlačítek plastičnost"
+msgstr "Vypnout u ovládacích tlačítek vypouklost (plastičnost)"
msgid "Combine play and pause buttons"
msgstr "Sloučit tlačítko pro přehrávání a pozastavení"
@@ -2145,25 +2145,25 @@
msgstr "Povolit nástrojový pruh"
msgid "Enable toolbar in Music Store"
-msgstr "Povolit v hudebním obchodu nástrojový pruh"
+msgstr "Povolit v hudební sbírce nástrojový pruh"
msgid "Enable statusbar in Music Store"
-msgstr "Povolit v hudebním obchodu stavový řádek"
+msgstr "Povolit v hudební sbírce stavový řádek"
msgid "Expand Stores on startup"
-msgstr "Rozbalit obchody při spuštění"
+msgstr "Rozbalit sbírky při spuštění"
msgid "Enable tree node icons"
msgstr "Povolit ikony uzlů ve stromu"
msgid "Enable Music Store tree node icons"
-msgstr "Povolit ikony uzlů ve stromu hudebního obchodu"
+msgstr "Povolit symboly uzlů ve stromu hudební sbírky"
msgid "Ask for confirmation when removing items"
msgstr "Dotazovat se na potvrzení při odstraňování položek"
msgid "Paths to Music Store databases"
-msgstr "Cesty do databází hudebního obchodu"
+msgstr "Cesty do databází hudební sbírky"
msgid "Path"
msgstr "Cesta"
@@ -2191,7 +2191,7 @@
"See the About box and the documentation for details."
msgstr ""
"Aqualung je sestaven bez podpory pro přídavný modul LADSPA.\n"
-"Podívejte se do okna O programu a do dokumentace na podrobnosti."
+"Podívejte se do okna s údaji programu a do dokumentace na podrobnosti."
msgid "Sample Rate Converter type"
msgstr "Typ převodníku vzorkovacího kmitočtu"
@@ -2271,8 +2271,8 @@
"Use basename only instead of full path\n"
"if no metadata is available."
msgstr ""
-"Použít základní název namísto celé cesty,\n"
-"pokud nejsou dostupná žádná popisná data."
+"Použít základní název namísto celé cesty, pokud nejsou dostupná žádná popisná "
+"data."
msgid "Metadata editor (File info dialog)"
msgstr "Editor popisných dat (dialog s informacemi o souboru)"
@@ -2281,8 +2281,8 @@
"When adding new frames, try to set their contents\n"
"from another tag's equivalent frame."
msgstr ""
-"Při přidávání nových oken se pokuste o nastavení jejich obsahu\n"
-"z okna značky se stejným obsahem."
+"Při přidávání nových oken se pokuste o nastavení jejich obsahu z okna značky\n"
+"se stejným obsahem."
msgid "MPEG audio ID3v1/ID3v2 character encoding"
msgstr "Kódování znaků ID3v1/ID3v2 MPEG audio"
@@ -2388,7 +2388,7 @@
msgstr "Seznam skladeb:"
msgid "Music Store: "
-msgstr "Hudební obchod: "
+msgstr "Hudební sbírka: "
msgid "Big timer: "
msgstr "Velké hodiny: "
@@ -2450,10 +2450,10 @@
msgstr "Počítá se..."
msgid "track"
-msgstr "Skladba"
+msgstr "skladba"
msgid "tracks"
-msgstr "Skladby"
+msgstr "skladeb"
msgid "Rename playlist"
msgstr "Přejmenovat seznam skladeb"
@@ -2561,7 +2561,7 @@
msgstr "Informace o souboru..."
msgid "Roll to active song"
-msgstr "Skutálet se k činné písni"
+msgstr "Skutálet se k nynější písni"
msgid "Stop adding files"
msgstr "Zastavit přidávání souborů"
@@ -2649,7 +2649,7 @@
msgstr " výstup P"
msgid "Search the Music Store"
-msgstr "Hledat v hudebním obchodu"
+msgstr "Prohledat hudební sbírku"
msgid "Key: "
msgstr "Klíč: "
@@ -2851,19 +2851,19 @@
msgstr "Poznámky:"
msgid "Please select the xml file for this store."
-msgstr "Vyberte, prosím, soubor XML pro tento obchod."
+msgstr "Vyberte, prosím, soubor XML pro tuto sbírku."
msgid "Create empty store"
-msgstr "Vytvořit prázdný obchod"
+msgstr "Vytvořit prázdnou sbírku"
msgid "Visible name:"
msgstr "Viditelný název:"
msgid "Edit Store"
-msgstr "Upravit obchod"
+msgstr "Upravit sbírku"
msgid "Use relative paths in store file"
-msgstr "Použít relativních cest v souboru s obchodem"
+msgstr "Použít relativních cest v souboru se sbírkou"
msgid "Add Artist"
msgstr "Přidat umělce"
@@ -2913,7 +2913,7 @@
#, c-format
msgid "Really remove \"%s\" from the Music Store?"
-msgstr "Opravdu odstranit \"%s\" z hudebního obchodu?"
+msgstr "Opravdu odstranit \"%s\" z hudební sbírky?"
msgid "Stop adding songs"
msgstr "Zastavit přidávání písní"
@@ -2923,18 +2923,18 @@
"The store '%s' already exists.\n"
"Add it on the Settings/Music Store tab."
msgstr ""
-"Obchod '%s' již existuje.\n"
-"Přidejte jej na kartě Nastavení/Hudební obchod."
+"Sbírka '%s' již existuje.\n"
+"Přidejte jej na kartě Nastavení/Sbírka desek."
#, c-format
msgid "Really remove store \"%s\" from the Music Store?"
-msgstr "Opravdu odstranit obchod \"%s\" z hudebního obchodu?"
+msgstr "Opravdu odstranit sbírku \"%s\" z hudební sbírky?"
msgid "Remove Store"
-msgstr "Odstranit obchod"
+msgstr "Odstranit sbírku"
msgid "Do you want to save the store before removing?"
-msgstr "Chcete před odstraněním obchod uložit?"
+msgstr "Chcete před odstraněním sbírku uložit?"
msgid "Remove Artist"
msgstr "Odstranit umělce"
@@ -2985,22 +2985,22 @@
"odpojen."
msgid "Build / Update store from filesystem..."
-msgstr "Postavit/Obnovit obchod ze souborového systému..."
+msgstr "Vytvořit/Obnovit sbírku ze souborového systému..."
msgid "Edit store..."
-msgstr "Upravit obchod..."
+msgstr "Upravit sbírku..."
msgid "Export store..."
-msgstr "Vyvést obchod..."
+msgstr "Vyvést sbírku..."
msgid "Save store"
-msgstr "Uložit obchod"
+msgstr "Uložit sbírku"
msgid "Remove store"
-msgstr "Odstranit obchod"
+msgstr "Odstranit sbírku"
msgid "Add new artist to this store..."
-msgstr "Přidat nového umělce do tohoto obchodu..."
+msgstr "Přidat nového umělce do této sbírky..."
msgid "Calculate volume (recursive)"
msgstr "Spočítat hlasitost (včetně podsložek)"
@@ -3097,7 +3097,7 @@
"in the Podcasts store popup menu."
msgstr ""
"Automatická aktualizace byla zakázána pro všechny kanály\n"
-"ve vyskakovací nabídce obchodu se zvukovými záznamy."
+"ve vyskakovací nabídce sbírky se zvukovými záznamy."
msgid "Limits"
msgstr "Omezení"
@@ -3109,7 +3109,7 @@
msgstr "Odstranit starší položky [den]:"
msgid "Maximum space to use [MB]:"
-msgstr "Největší velikost místa k použití (MiB]:"
+msgstr "Největší velikost místa k použití [MB]:"
msgid "Podcasts"
msgstr "Zvukové záznamy"
@@ -3125,7 +3125,7 @@
#, c-format
msgid "Really remove '%s' from the Music Store?"
-msgstr "Opravdu odstranit \"'%s\" z hudebního obchodu?"
+msgstr "Opravdu odstranit \"'%s\" z hudební sbírky?"
msgid "Reorder feeds"
msgstr "Přeuspořádat kanály"
@@ -3135,7 +3135,7 @@
"to set the feed order in the Music Store."
msgstr ""
"Táhněte a pusťte záznamy do seznamu níže\n"
-"pro nastavení pořadí kanálů v hudebním obchodu."
+"pro nastavení pořadí kanálů v hudební sbírce."
#, c-format
msgid "Downloading %d/%d (%d%%) ..."
@@ -3221,7 +3221,7 @@
msgstr "Soubory s příponou Lua (*.lua)"
msgid "Music Store Files (*.xml)"
-msgstr "Soubory hudebního obchodu (*.xml)"
+msgstr "Soubory s hudební sbírkou (*.xml)"
msgid "Aqualung playlist (*.xml)"
msgstr "Seznam skladeb Aqualung (*.xml)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-08-19 14:27:04
|
Revision: 1306
http://sourceforge.net/p/aqualung/code/1306
Author: tszilagyi
Date: 2014-08-19 14:26:54 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
Updated cs.po from Pavel Fric
Modified Paths:
--------------
trunk/po/cs.po
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2014-08-15 10:01:38 UTC (rev 1305)
+++ trunk/po/cs.po 2014-08-19 14:26:54 UTC (rev 1306)
@@ -7,9 +7,9 @@
"Project-Id-Version: aqualung SVN\n"
"Report-Msgid-Bugs-To: aqu...@li...\n"
"POT-Creation-Date: 2014-08-14 20:42+0200\n"
-"PO-Revision-Date: 2014-08-14 23:54+0200\n"
+"PO-Revision-Date: 2014-08-16 15:40+0200\n"
"Last-Translator: Pavel Fric <pav...@se...>\n"
-"Language-Team: Czech <kde...@kd...>\n"
+"Language-Team: Czech <tra...@li...>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,103 +21,103 @@
msgstr "Volitelné funkce:"
msgid "LADSPA plugin support\n"
-msgstr ""
+msgstr "Podpora pro přídavný modul LADSPA\n"
msgid "CDDA (Audio CD) support\n"
-msgstr ""
+msgstr "Podpora pro CDDA (zvukové CD)\n"
msgid "CDDB support\n"
-msgstr ""
+msgstr "Podpora pro CDDB\n"
msgid "Sample Rate Converter support\n"
-msgstr ""
+msgstr "Podpora pro převodník vzorkovacího kmitočtu\n"
msgid "iRiver iFP driver support\n"
-msgstr ""
+msgstr "Podpora pro iFP iRiver\n"
msgid "JACK port management support\n"
-msgstr ""
+msgstr "Podpora pro správu přípojky JACK\n"
msgid "Loop playback support\n"
-msgstr ""
+msgstr "Podpora pro přehrávání ve smyčce\n"
msgid "Systray support\n"
-msgstr ""
+msgstr "Podpora pro oznamovací oblast panelu\n"
msgid "Podcast support\n"
-msgstr ""
+msgstr "Podpora pro zvukové záznamy\n"
msgid "Lua extension support\n"
-msgstr ""
+msgstr "Podpora pro rozšíření Lua\n"
msgid "Decoding support:"
-msgstr ""
+msgstr "Podpora pro dekódování:"
msgid "sndfile (WAV, AIFF, etc.)\n"
-msgstr ""
+msgstr "sndfile (WAV, AIFF atd.)\n"
msgid "Free Lossless Audio Codec (FLAC)\n"
-msgstr ""
+msgstr "Free Lossless Audio Codec (FLAC)\n"
msgid "Ogg Vorbis\n"
-msgstr ""
+msgstr "Ogg Vorbis\n"
msgid "Ogg Speex\n"
-msgstr ""
+msgstr "Ogg Speex\n"
msgid "MPEG Audio (MPEG 1-2.5 Layer I-III)\n"
-msgstr ""
+msgstr "MPEG Audio (MPEG 1-2.5 Layer I-III)\n"
msgid "MOD Audio (MOD, S3M, XM, IT, etc.)\n"
-msgstr ""
+msgstr "MOD Audio (MOD, S3M, XM, IT atd.)\n"
msgid "Musepack\n"
-msgstr ""
+msgstr "Musepack\n"
msgid "Monkey's Audio Codec\n"
-msgstr ""
+msgstr "Monkey's Audio Codec\n"
msgid "WavPack\n"
-msgstr ""
+msgstr "WavPack\n"
msgid "LAVC (AC3, AAC, WavPack, WMA, etc.)\n"
-msgstr ""
+msgstr "LAVC (AC3, AAC, WavPack, WMA atd.)\n"
msgid "Encoding support:"
-msgstr ""
+msgstr "Podpora pro zakódování:"
msgid "sndfile (WAV)\n"
msgstr "sndfile (WAV)\n"
msgid "LAME (MP3)\n"
-msgstr ""
+msgstr "LAME (MP3)\n"
msgid "Output driver support:"
-msgstr ""
+msgstr "Podporované výstupní metody:"
msgid "sndio Audio\n"
-msgstr ""
+msgstr "Zvuk sndio\n"
msgid "OSS Audio\n"
-msgstr ""
+msgstr "Zvuk OSS\n"
msgid "ALSA Audio\n"
-msgstr ""
+msgstr "Zvuk ALSA\n"
msgid "JACK Audio Server\n"
-msgstr ""
+msgstr "Zvukový server JACK\n"
msgid "PulseAudio\n"
-msgstr ""
+msgstr "PulseAudio\n"
msgid "Win32 Sound API\n"
-msgstr ""
+msgstr "Win32 Sound API\n"
msgid "About"
msgstr "O programu"
msgid "Build version: "
-msgstr ""
+msgstr "Verze sestavení: "
msgid "Homepage:"
msgstr "Stránky projektu:"
@@ -126,26 +126,25 @@
msgstr "Autoři:"
msgid "Core design, engineering & programming:\n"
-msgstr ""
+msgstr "Hlavní návrh, řízení a programování:\n"
msgid "Skin support, look & feel, GUI hacks:\n"
-msgstr ""
+msgstr "Podpora vzhledů, výraz a dojem, zásahy do rozhraní:\n"
msgid "Programming, GUI engineering:\n"
-msgstr ""
+msgstr "Programování, práce na rozhraní:\n"
msgid "OpenBSD compatibility, metadata tweaks:\n"
-msgstr ""
+msgstr "Slučitelnost s OpenBSD, doladění popisných dat:\n"
msgid "Miscellaneous, minimalism:\n"
msgstr "Různé, minimalismus:\n"
-#, fuzzy
msgid "Translators:"
-msgstr "Přeložili"
+msgstr "Překladatelé:"
msgid "Chinese (simplified):\n"
-msgstr ""
+msgstr "Čínština (zjednodušená):\n"
msgid "Dutch:\n"
msgstr "Holandština:\n"
@@ -251,7 +250,6 @@
msgid "Force other letters to lowercase"
msgstr "Vynutit malá písmena"
-#, fuzzy
msgid "Regular expression"
msgstr "Regulární výraz"
@@ -277,45 +275,51 @@
msgstr "Oříznout mezery na začátku, na konci a zdvojené mezery"
msgid "Regexp matches empty string"
-msgstr ""
+msgstr "Regulární výraz odpovídá prázdnému řetězci"
msgid "Please select the root directory."
-msgstr ""
+msgstr "Vyberte, prosím, kořenový adresář."
msgid "Select build type"
-msgstr ""
+msgstr "Vyberte typ sestavení"
msgid "Directory driven"
-msgstr ""
+msgstr "Uspořádáno adresářově"
msgid ""
"Follows the directory structure to identify the artists and\n"
"records. The files are added on a record basis."
msgstr ""
+"Sleduje stavbu složek, aby vypátral umělce a alba.\n"
+"Soubory jsou přidávány na základě alb."
msgid "Independent"
-msgstr ""
+msgstr "Nezávislé"
msgid ""
"Recursive search from the root directory for audio files.\n"
"The files are processed independently, so only metadata\n"
"and filename transformation are available."
msgstr ""
+"Hledání zvukových souborů ve složkách včetně podsložek od kořenového "
+"adresáře.\n"
+"Soubory jsou zpracovány nezávisle, takže jsou dostupná jen popisná data a "
+"proměny souborového názvu."
msgid "Load settings from Music Store file"
-msgstr ""
+msgstr "Nahrát nastavení ze souboru s hudební sbírkou"
msgid "Build/Update store"
-msgstr ""
+msgstr "Vytvořit/Aktualizovat sbírku"
msgid "General"
msgstr "Obecné"
msgid "Directory structure"
-msgstr ""
+msgstr "Adresářová stavba"
msgid "Root path:"
-msgstr ""
+msgstr "Kořenový adresář:"
msgid "_Browse..."
msgstr "_Procházet..."
@@ -324,40 +328,40 @@
msgstr "Stavba:"
msgid "root / record / track"
-msgstr ""
+msgstr "Kořen / Album / Název"
msgid "root / artist / record / track"
-msgstr ""
+msgstr "Kořen / Umělec / Umělec / Album / Název"
msgid "root / artist / artist / record / track"
-msgstr ""
+msgstr "Kořen / Umělec / Umělec / Album / Název"
msgid "root / artist / artist / artist / record / track"
-msgstr ""
+msgstr "Kořen / Umělec / Umělec / Umělec / Album / Název"
msgid "Exclude files matching wildcard"
-msgstr ""
+msgstr "Vyloučit soubory, které odpovídají masce"
msgid "Include only files matching wildcard"
-msgstr ""
+msgstr "Zahrnout pouze soubory, které odpovídají masce"
msgid "Reread data for existing tracks"
-msgstr ""
+msgstr "Načíst znovu data pro existující skladby"
msgid "Remove non-existing files from store"
-msgstr ""
+msgstr "Odstranit neexistující soubory ze sbírky desek"
msgid "Artist"
msgstr "Umělec"
msgid "Sort artists by"
-msgstr ""
+msgstr "Třídit umělce dle"
msgid "Artist name"
msgstr "Jméno umělce"
msgid "Artist name (lowercase)"
-msgstr ""
+msgstr "Jméno umělce (malá písmena)"
msgid "Directory name"
msgstr "Název adresáře"
@@ -366,7 +370,7 @@
msgstr "Název adresáře (malá písmena)"
msgid "Record"
-msgstr "Nahrávat"
+msgstr "Nahrávka"
msgid "Sort records by"
msgstr "Řadit nahrávky dle"
@@ -381,7 +385,7 @@
msgstr "Rok"
msgid "Add year to the comments of new records"
-msgstr ""
+msgstr "Přidat rok do poznámek k novým nahrávkám"
msgid "Track"
msgstr "Skladba"
@@ -395,7 +399,6 @@
msgid "Sandbox"
msgstr "Pískoviště"
-#, fuzzy
msgid "Filename:"
msgstr "Název souboru:"
@@ -403,7 +406,7 @@
msgstr "Zkouška"
msgid "Building store from filesystem"
-msgstr ""
+msgstr "Sestavení sbírky desek na základě souborového systému"
msgid "Processing:"
msgstr "Zpracování:"
@@ -457,7 +460,7 @@
msgstr "Datový tok (kb/s):"
msgid "Artist/Album already existing, not empty"
-msgstr ""
+msgstr "Umělec/Album již existuje a není prázdný"
msgid ""
"\n"
@@ -467,9 +470,15 @@
"destination Music Store. Press Cancel to get back to change the Artist/Album "
"or the destination Music Store."
msgstr ""
+"\n"
+"Vybraná sbírka desek má již odpovídajícího umělce a album, které již obsahuje "
+"skladby. Pokud stisknete OK, tyto skladby budou odstraněny. Samotné soubory "
+"budou ponechány nedotčeny, ale budou odstraněny z cílové sbírky desek. "
+"Stiskněte Zrušit pro návrat zpět pro změnu umělce/alba, nebo pro návrat zpět "
+"do cílové sbírky desek"
msgid "Rip CD"
-msgstr ""
+msgstr "Vytáhnout skladby z CD"
msgid "Artist:"
msgstr "Umělec:"
@@ -511,7 +520,7 @@
msgstr "Cílový adresář pro vytažené soubory"
msgid "Add to Music Store"
-msgstr "Přidat do hudebního obchodu"
+msgstr "Přidat do sbírky desek"
msgid "Format"
msgstr "Formát"
@@ -538,7 +547,7 @@
msgstr "Ověřit celistvost dat"
msgid "Unlimited retry on failed reads (never skip)"
-msgstr ""
+msgstr "Neomezený počet pokusů o přečtení (nikdy nepřeskakovat)"
msgid "Maximum number of retries:"
msgstr "Nejvyšší počet opakovaných pokusů:"
@@ -550,6 +559,8 @@
"\n"
"Destination directory is not read-write accessible!"
msgstr ""
+"\n"
+"Cílový adresář není přístupný pro čtení a zápis!"
msgid "Total"
msgstr "Celkem"
@@ -585,13 +596,13 @@
msgstr "Dotaz na CDDB"
msgid "Retrieving matches from server..."
-msgstr ""
+msgstr "Přijímají se nálezy od serveru..."
msgid "Connecting to CDDB server..."
msgstr "Spojuje se se serverem CDDB..."
msgid "An error occurred while attempting to connect to the CDDB server."
-msgstr ""
+msgstr "Při pokusu o spojení se se serverem CDDB se stala chyba."
msgid "Warning"
msgstr "Varování"
@@ -612,38 +623,48 @@
"Artist appears to be in all lowercase.\n"
"Do you want to proceed?"
msgstr ""
+"Jméno umělce se zdá být celé napsáno malými písmeny.\n"
+"Chcete pokračovat?"
msgid ""
"Artist appears to be in all uppercase.\n"
"Do you want to proceed?"
msgstr ""
+"Jméno umělce se zdá býti celé napsáno velkými písmeny.\n"
+"Chcete pokračovat?"
msgid ""
"Title appears to be in all lowercase.\n"
"Do you want to proceed?"
msgstr ""
+"Název se zdá být celý napsán malými písmeny.\n"
+"Chcete pokračovat?"
msgid ""
"Title appears to be in all uppercase.\n"
"Do you want to proceed?"
msgstr ""
+"Název se zdá být celý napsán velkými písmeny.\n"
+"Chcete pokračovat?"
msgid ""
"It is very likely that the year is wrong.\n"
"Do you want to proceed?"
msgstr ""
+"Je velice pravděpodobné, že rok je uveden špatně.\n"
+"Chcete pokračovat?"
msgid "The email address provided for submission is invalid."
-msgstr ""
+msgstr "E-mailová adresa poskytnutá pro odeslání je neplatná."
msgid "An error occurred while submitting the record to the CDDB server."
-msgstr ""
+msgstr "Při odesílání záznamu serveru CDDB se stala chyba."
msgid "Correct existing record"
-msgstr ""
+msgstr "Opravit stávající záznam"
msgid "Submit new record"
-msgstr ""
+msgstr "Odeslat nový záznam"
msgid "Matches:"
msgstr "Shody:"
@@ -670,7 +691,7 @@
msgstr "Skladby"
msgid "You have to provide an email address for CDDB submission."
-msgstr ""
+msgstr "Musíte poskytnout e-mailovou adresu pro odeslání CDDB."
msgid "Unknown Album"
msgstr "Neznámé album"
@@ -679,7 +700,7 @@
msgstr "Neznámá skladba"
msgid "Please select the directory for exported files."
-msgstr ""
+msgstr "Vyberte, prosím, adresář pro vyvedené soubory."
msgid "Copy"
msgstr "Kopírovat"
@@ -696,9 +717,16 @@
"file extension are denoted by %%n and %%x, respectively. %%i gives an "
"identifier which is unique within an export session."
msgstr ""
+"\n"
+"Tento řetězec předlohy, jejž zde zadáte, se použije k sestavení názvu souboru "
+"pro "
+"soubory k vyvedení. Umělec, album a názvy skladeb jsou označeny "
+"%%a, %%r a %%t. Číslo skladby a na formátu závislá přípona souboru "
+"jsou označeny %%n a %%x. Příznak %%i je označení, které je jedinečné "
+"během vyváděcího sezení."
msgid "Exporting files"
-msgstr ""
+msgstr "Vyvádí se soubory"
msgid "Source file:"
msgstr "Zdrojový soubor:"
@@ -710,13 +738,13 @@
msgstr "Postup:"
msgid "Error in format string"
-msgstr ""
+msgstr "Chyba v řetězci formátování"
msgid "Export files"
msgstr "Vyvést soubory"
msgid "Location and filename"
-msgstr ""
+msgstr "Umístění a název souboru"
msgid "Target directory:"
msgstr "Cílový adresář:"
@@ -731,20 +759,25 @@
"Subdirectory name\n"
"length limit:"
msgstr ""
+"Omezení délky\n"
+"názvu podadresáře"
msgid "Filename template:"
-msgstr ""
+msgstr "Předloha pro název souboru:"
msgid "Filter"
msgstr "Filtr"
msgid "Do not reencode files already being in the target format"
-msgstr ""
+msgstr "Soubory, které již jsou v cílovém formátu, nekódovat znovu"
msgid ""
"Do not reencode files\n"
"matching wildcard:"
msgstr ""
+"Nekódovat znovu soubory,\n"
+"které odpovídají masce:"
+":"
msgid "*File info"
msgstr "*Informace o souboru"
@@ -753,7 +786,7 @@
msgstr "Informace o souboru"
msgid "There are unsaved changes to the file metadata."
-msgstr ""
+msgstr "Jsou tu neuložené změny v popisných datech souboru."
msgid "Save and close"
msgstr "Uložit a zavřít"
@@ -769,41 +802,51 @@
"Conversion error in field %s:\n"
"'%s' does not conform to format '%s'!"
msgstr ""
+"Chyba převodu v poli %s:\n"
+"'%s' neodpovídá formátu '%s'!"
msgid ""
"Attached Picture frame with no image set!\n"
"Please set an image or remove the frame."
msgstr ""
+"Připojený rámeček obrázku neobsahuje žádný obrázek!\n"
+"Vložte, prosím, obrázek, nebo odstraňte rámeček."
#, c-format
msgid ""
"Failed to write metadata to file.\n"
"Reason: %s"
msgstr ""
+"Nepodařilo se zapsat popisná data do souboru.\n"
+"Důvod: %s"
#, c-format
msgid ""
"Error converting field %s to Year:\n"
"'%s' is not an integer number!"
msgstr ""
+"Chyba při změně pole %s na Rok:\n"
+"'%s' není celé číslo!"
msgid "Please specify the file to save the image to."
-msgstr ""
+msgstr "Zadejte, prosím, soubor, do něhož se má uložit obrázek."
msgid "(no image)"
-msgstr ""
+msgstr "(žádný obrázek)"
msgid "(error loading image)"
msgstr "(chyba při nahrávání obrázku)"
msgid "Please specify the file to load the image from."
-msgstr ""
+msgstr "Zadejte, prosím, soubor, z něhož se má nahrát obrázek."
#, c-format
msgid ""
"Could not load image from:\n"
"%s"
msgstr ""
+"Nepodařilo se nahrát obrázek z:\n"
+"%s"
#, c-format
msgid "MIME type: %s"
@@ -933,6 +976,8 @@
"One or more stores in Music Store have been modified.\n"
"Do you want to save them before exiting?"
msgstr ""
+"Jedna nebo více sbírek v hudební sbírce bylo změněno.\n"
+"Chcete je uložit před ukončením?"
msgid "Do not exit"
msgstr "Neukončovat"
@@ -977,16 +1022,20 @@
#, c-format
msgid "JACK has either been shutdown or it disconnected Aqualung. Reason: %s"
-msgstr ""
+msgstr "JACK byl buď vypnut, nebo odpojil Aqualung. Důvod: %s"
msgid "Warn me if the Window Manager does not support system tray"
-msgstr ""
+msgstr "Varovat, pokud správce oken nepodporuje oznamovací oblast panelu"
msgid ""
"Aqualung is compiled with system tray support, but the status icon could not "
"be embedded in the notification area. Your desktop may not have support for "
"a system tray, or it has not been configured correctly."
msgstr ""
+"Aqualung je sestaven s podporou pro oznamovací oblast panelu, ale stavovou "
+"ikonu "
+"se nepodařilo vložit do oznamovací oblasti. Vaše pracovní prostředí buď nemá "
+"podporou pro systémový panel, nebo to nebylo nastaveno správně."
msgid "Settings"
msgstr "Nastavení"
@@ -1025,13 +1074,13 @@
msgstr "Zamíchat písně"
msgid "Toggle playlist"
-msgstr "Přepnout seznam skladeb"
+msgstr "Zobrazit seznam skladeb"
msgid "Toggle music store"
-msgstr "Přepnout hudební obchod"
+msgstr "Zobrazit sbírku desek"
msgid "Toggle LADSPA patch builder"
-msgstr "Přepnout stavitele záplaty LADSPA"
+msgstr "Zobrazit filtry LADSPA"
msgid "Show Aqualung"
msgstr "Ukázat Aqualung"
@@ -1084,6 +1133,9 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"Adresář '%s' bude odstraněn s celým svým obsahem.\n"
+"\n"
+"Chcete pokračovat?"
#, c-format
msgid ""
@@ -1091,6 +1143,9 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"Soubor '%s' bude odstraněn.\n"
+"\n"
+"Chcete pokračovat?"
msgid "Remove"
msgstr "Odstranit"
@@ -1111,22 +1166,28 @@
"No suitable iRiver iFP device found.\n"
"Perhaps it is unplugged or turned off."
msgstr ""
+"Nebylo nalezeno žádné vhodné zařízení iFP iRiver.\n"
+"Snad není zastrčeno, nebo je vypnuto."
msgid ""
"Device is busy.\n"
"(Aqualung was unable to claim its interface.)"
msgstr ""
+"Zařízení je zaneprázdněno.\n\n"
+"Aqualung nebyl schopen domoci se jeho používání.)"
msgid ""
"Device is not responding.\n"
"Try jiggling the handle."
msgstr ""
+"Zařízení neodpovídá.\n"
+"Přezkoušejte, prosím, připojení zařízení."
msgid "Please select a local path."
-msgstr ""
+msgstr "Vyberte, prosím, místní cestu."
msgid "Please select at least one valid song from playlist."
-msgstr ""
+msgstr "Vyberte, prosím, ze seznamu skladeb alespoň jednu platnou píseň."
#, c-format
msgid ""
@@ -1134,6 +1195,9 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"Jedna z písní je ve formátu nepodporovaném vaším přehrávačem.\n"
+"\n"
+"Chcete pokračovat?"
#, c-format
msgid ""
@@ -1141,6 +1205,9 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"%d z %d písní je ve formátu nepodporovaném vaším přehrávačem.\n"
+"\n"
+"Chcete pokračovat?"
#, c-format
msgid ""
@@ -1148,6 +1215,9 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"Vybraná píseň je ve formátu nepodporovaném vaším přehrávačem.\n"
+"\n"
+"Chcete pokračovat?"
#, c-format
msgid ""
@@ -1155,12 +1225,15 @@
"\n"
"Do you want to proceed?"
msgstr ""
+"Žádná z vybraných písní není ve formátu podporovaném vaším přehrávačem.\n"
+"\n"
+"Chcete pokračovat?"
msgid "iFP device manager (upload mode)"
-msgstr ""
+msgstr "Správce zařízení iFP (režim nahrávání)"
msgid "iFP device manager (download mode)"
-msgstr ""
+msgstr "Správce zařízení iFP (režim stahování)"
msgid "Selected files:"
msgstr "Vybrané soubory:"
@@ -1306,18 +1379,17 @@
msgid "Record Location"
msgstr "Místo nahrávání"
-#, fuzzy
msgid "Media"
-msgstr "Hudební soubory"
+msgstr "Typ média"
msgid "Index"
msgstr "Index"
msgid "Related"
-msgstr ""
+msgstr "Spojeno s"
msgid "Abstract"
-msgstr ""
+msgstr "Shrnutí"
msgid "Language"
msgstr "Jazyk"
@@ -1467,13 +1539,13 @@
msgstr "Vrchol alba při vyrovnání hlasitosti"
msgid "Icy-Name"
-msgstr ""
+msgstr "Icy-Název"
msgid "Icy-Description"
-msgstr ""
+msgstr "Icy-Popis"
msgid "Icy-Genre"
-msgstr ""
+msgstr "Icy-Žánr"
msgid "RVA"
msgstr "RVA"
@@ -1484,9 +1556,8 @@
msgid "Binary Object"
msgstr "Binární objekt"
-#, fuzzy
msgid "NULL"
-msgstr "Plná"
+msgstr "NULL"
msgid "ID3v1"
msgstr "ID3v1"
@@ -1606,7 +1677,7 @@
msgstr "Značka vydavatele/nahrávacího studia"
msgid "Music Store"
-msgstr "Hudební obchod"
+msgstr "Sbírka desek"
msgid "Search..."
msgstr "Hledat..."
@@ -1630,18 +1701,18 @@
msgstr "Vytvořit prázdný obchod..."
msgid "*Music Store"
-msgstr "*Hudební obchod"
+msgstr "*Sbírka desek"
#, c-format
msgid "Do you want to save store \"%s\" before removing from Music Store?"
-msgstr ""
+msgstr "Chcete uložit sbírku \"%s\" před jejím odstraněním ze sbírky desek?"
msgid ""
"You will need to restart Aqualung for the following changes to take effect:"
-msgstr ""
+msgstr "Aby se projevily následující změny, musí se Aqualung spustit znovu:"
msgid "Select a font..."
-msgstr ""
+msgstr "Vybrat písmo..."
msgid "Disable skin support"
msgstr "Zakázat podporu vzhledu"
@@ -1659,13 +1730,13 @@
msgstr "Vyberte, prosím, soubor s příponou Lua"
msgid "Please select a Music Store database."
-msgstr "Vyberte, prosím, databázi Hudební obchod."
+msgstr "Vyberte, prosím, databázi s hudební sbírkou."
msgid "Paths must either be absolute or starting with a tilde."
-msgstr ""
+msgstr "Cesty musí být buď absolutní, anebo začínat vlnovkou."
msgid "The specified store has already been added to the list."
-msgstr ""
+msgstr "Zadaná sbírka již byla přidána do seznamu."
#, c-format
msgid ""
@@ -1674,6 +1745,10 @@
"line from an Artist, a Record and a Track name. These are denoted by %%a, "
"%%r and %%t, respectively.\n"
msgstr ""
+"\n"
+"Řetězec předlohy, jejž zde zadáte, se použije k sestavení názvového řádku "
+"složeného z umělce, alba a názvu skladby. Tyto jsou označeny "
+"%%a, %%r a %%t.\n"
msgid ""
"\n"
@@ -1698,6 +1773,27 @@
"\n"
"NOTE: There might be a more suitable character encoding for your language."
msgstr ""
+"\n"
+"Pokud máte zvukový soubor MPEG s nestandardním kódováním znaků ID3v1/ID3v2, "
+"zadejte, prosím, vhodné kódování znaků zde (viz níže). Pokud je toto pole "
+"ponecháno prázdné, použije se standardní kódování znaků (ISO-8859-1).\n"
+"\n"
+"Například:\n"
+" Japonština: CP932 (SHIFT_JIS variant)\n"
+" Korejština: EUC-KR\n"
+" Zjednodušená čínština: GB2312\n"
+" Tradiční čínština: BIG5\n"
+" Řečtina: ISO-8859-7\n"
+" Hebrejština: ISO-8859-8\n"
+" Azbuka: CP1251\n"
+" Thajština: ISO-8859-11\n"
+" Arabština: CP1256\n"
+" Turečtina: ISO-8859-9\n"
+" Rozšířená latinka: ISO-8859-2\n"
+" Středoevropské jazyky: CP1250\n"
+" Latin1 (standardní): ISO-8859-1\n"
+"\n"
+"POZNÁMKA: Pro váš jazyk může být vhodnější kódování znaků."
msgid ""
"\n"
@@ -1710,6 +1806,17 @@
"('filename') .. ')'\n"
"end"
msgstr ""
+"\n"
+"Soubor, který zde zadáte/vyberete nastaví používání programu Lua pro "
+"rozšíření "
+"Aqualungu. Na podrobnosti se podívejte do příručky k Aqualungu. Zde je rychlý "
+"příklad toho, co "
+"můžete použít v souboru:\n"
+"\n"
+"function playlist_title()\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
+"('filename') .. ')'\n"
+"end"
msgid ""
"\n"
@@ -1721,6 +1828,16 @@
"Example: enter '-o alsa -R' below to use ALSA output running realtime as a "
"default.\n"
msgstr ""
+"\n"
+"Řetězec, který zde zadáte, bude zpracován jako příkazový řádek, předtím než "
+"bude "
+"zpracován vlastní parameter příkazového řádku. Co zde napíšete, bude sloužit "
+"jako přednastavení a může být nebo nemusí být přepsáno skutečným příkazovým "
+"řádkem.\n"
+"\n"
+"Příklad: Zadejte '-o alsa -R', aby se používal výstup ALSA ve skutečném čase "
+"jako "
+"výchozí přednastavení.\n"
msgid ""
"Paths must either be absolute or starting with a tilde, which will be "
@@ -1728,6 +1845,11 @@
"\n"
"Drag and drop entries in the list to set the store order in the Music Store."
msgstr ""
+"Cesty musí být buď absolutní, anebo začínat vlnovkou, která bude "
+"rozšířena do domovského adresáře uživatele.\n"
+"\n"
+"Táhněte a pusťte záznamy v seznamu pro nastavení pořadí hudebních sbírek "
+"ve sbírce desek."
msgid ""
"\n"
@@ -1743,6 +1865,23 @@
"happens with maximum available speed and with error correction modes "
"manually set before every run."
msgstr ""
+"\n"
+"Nastavte rychlost mechaniky pro přehrávání CD v jednotkách rychlosti CD-ROM. "
+"Jedna "
+"jednotka rychlosti se rovná 176 kB/s rychlosti čtení nezpracovaných dat. "
+"Varování: Ne "
+"všechny mechaniky ctí toto nastavení.\n"
+"\n"
+"Nižší rychlost obvykle znamená menší hlučnost mechaniky. Nicméně, když se "
+"k opravě chyb používají režimy Paranoia pro zvýšenou přesnost, jsou kvůli "
+"zabránění "
+"podtečení vyrovnávací paměti vyžadovány obecně mnohem vyšší rychlosti "
+"(a tudíž dochází ke slyšitelným výpadkům záznamu na nosiči).\n"
+"\n"
+"Všimněte si, prosím, že tato nastavení se nepoužívají na vytahování skladeb z "
+"CD, což "
+"se vždy děje s nejvyšší dostupnou rychlostí a s režimy pro opravu chyb "
+"nastavenými ručně před každým spuštěním."
msgid ""
"\n"
@@ -1751,6 +1890,13 @@
"properly, and thus it may happen that a newly inserted CD remains unnoticed "
"to Aqualung. In such cases, enabling this option should help."
msgstr ""
+"\n"
+"Většina mechanik dá Aqualungu vědět, když bylo CD vloženo nebo odstraněno "
+"poskytnutím příznaku 'media changed'. Nicméně některé mechaniky tento příznak "
+"nevidí "
+"správně, a tak se může stát, že nově vložené CD zůstane Aqualungem "
+"nepovšimnuto. "
+"V takových případech by mělo pomoci povolení této volby."
msgid ""
"\n"
@@ -1758,6 +1904,10 @@
"that should be accessed without using the proxy set above.\n"
"Example: localhost, .localdomain, .my.domain.com"
msgstr ""
+"\n"
+"Zde zadejte čárkou oddělený seznam domén,\n"
+"ke kterým se má přistupovat bez použití nastavení proxy výše.\n"
+"Příklad: localhost, .localdomain, .my.domain.com"
msgid "Embed playlist into main window"
msgstr "Vložit seznam skladeb do hlavního okna"
@@ -1820,7 +1970,7 @@
msgstr "Hlavní okno"
msgid "Disable control buttons relief"
-msgstr ""
+msgstr "Vypnout u ovládacích tlačítek plastičnost"
msgid "Combine play and pause buttons"
msgstr "Sloučit tlačítko pro přehrávání a pozastavení"
@@ -1841,7 +1991,7 @@
msgstr "Oznamovací oblast panelu"
msgid "Start minimized"
-msgstr "Spustit zmenšeno v panelu"
+msgstr "Spustit přehrávač zmenšený v panelu"
msgid "Play/Stop song"
msgstr "Přehrát/Zastavit píseň"
@@ -1865,7 +2015,7 @@
msgstr "Různé"
msgid "Implicit command line"
-msgstr "Obsažený příkazový řádek"
+msgstr "Zahrnutý příkazový řádek"
msgid "Cover art"
msgstr "Obal"
@@ -1892,7 +2042,7 @@
msgstr "Nezvětšovat obrázky s menší šířkou"
msgid "Show cover thumbnail for Music Store tracks only"
-msgstr "Ukázat náhled obalu pouze pro skladby hudebního obchodu"
+msgstr "Ukázat náhled na obrázek obalu jen pro skladby v hudební sbírce"
msgid "Don't show cover thumbnail in the main window"
msgstr "Neukazovat náhled obalu v hlavním okně"
@@ -1904,13 +2054,13 @@
msgstr "Povolit nástrojové rady"
msgid "Simple view in LADSPA patch builder"
-msgstr "Jednoduchý pohled ve staviteli záplaty LADSPA"
+msgstr "Jednoduchý pohled v nastavení filtrů LADSPA"
msgid "United windows minimization"
-msgstr "Jednotné zmenšení oken"
+msgstr "Zmenšení všech oken ve stejnou dobu"
msgid "Show hidden files and directories in file choosers"
-msgstr "Ukazovat ve voličích souborů skryté soubory a adresáře"
+msgstr "Ukazovat skryté soubory a adresáře ve voličích souborů"
msgid "Show tags tab first in the file info dialog"
msgstr "Ukázat v dialogu s informacemi o souboru nejprve kartu se značkami"
@@ -1919,7 +2069,7 @@
msgstr "Seznam skladeb"
msgid "Put control buttons at the bottom of playlist"
-msgstr ""
+msgstr "Umístit ovládací tlačítka v seznamu skladeb dolů"
msgid "Save and restore the playlist on exit/startup"
msgstr "Uložit a obnovit seznam skladeb při ukončení/při spuštění"
@@ -1928,7 +2078,7 @@
msgstr "Ukládat pravidelně seznam skladeb [min]:"
msgid "Album mode is the default when adding entire records"
-msgstr ""
+msgstr "Režim alba je výchozí, když je přidáno celé album"
msgid "Always show the tab bar"
msgstr "Vždy ukazovat pruh s kartami"
@@ -1937,7 +2087,7 @@
msgstr "Ukázat tlačítko pro zavírání v kartě"
msgid "When shuffling, records added in Album mode are played in order"
-msgstr ""
+msgstr "Alba přidaná v režimu alba jsou přehrávána v náhodném režimu popořadě"
msgid "Enable statusbar"
msgstr "Povolit stavový řádek"
@@ -1961,7 +2111,7 @@
msgstr "Automaticky posunout na činnou skladbu"
msgid "Enable rules hint"
-msgstr "Povolit radu s pravidly"
+msgstr "Použít v seznamech náhradní barvy"
msgid "Playlist column order"
msgstr "Pořadí sloupců v seznamu skladeb"
@@ -1970,8 +2120,8 @@
"Drag and drop entries in the list below \n"
"to set the column order in the Playlist."
msgstr ""
-"Táhněte a pusťte záznamy do seznamu níže\n"
-"pro nastavení pořadí sloupců v seznamu skladeb."
+"Táhněte a pusťte záznamy do seznamu níže pro\n"
+"nastavení pořadí sloupců v seznamu skladeb."
msgid "Column"
msgstr "Sloup"
@@ -1989,7 +2139,7 @@
msgstr "Skrýt okno s poznámkou"
msgid "Hide the Music Store comment pane"
-msgstr "Skrýt v hudebním obchodu okno s poznámkou"
+msgstr "Skrýt sbírku desek v okně s poznámkou"
msgid "Enable toolbar"
msgstr "Povolit nástrojový pruh"
@@ -2025,7 +2175,7 @@
msgstr "Obnovit"
msgid "DSP"
-msgstr "Digitální zpracování signálu (DSP)"
+msgstr "Digitální zpracování signálu"
msgid "LADSPA plugin processing"
msgstr "Zpracování přídavného modulu LADSPA"
@@ -2081,44 +2231,48 @@
msgstr "Strmost [dB/dB]:"
msgid "RVA for Unmeasured Files [dB] :"
-msgstr "RVA pro nezměřené soubory[dB]:"
+msgstr "RVA pro nezměřené soubory [dB]:"
msgid "Apply averaged RVA to tracks of the same record"
-msgstr ""
+msgstr "Použít průměrné RVA na všechny skladby alba"
msgid "Drop statistical aberrations based on"
-msgstr ""
+msgstr "Zmenšení statistické odchylky založené na"
#, no-c-format
msgid "% of standard deviation"
-msgstr ""
+msgstr "% směrodatné odchylky"
msgid "Linear threshold [dB]"
-msgstr ""
+msgstr "Lineární práh [dB]"
msgid "Linear threshold [dB] :"
-msgstr ""
+msgstr "Lineární práh [dB]:"
#, no-c-format
msgid "% of standard deviation :"
-msgstr ""
+msgstr "% směrodatné odchylky:"
msgid "ReplayGain tag to use (with fallback to the other): "
msgstr ""
+"Použít následující značku pro vyrovnání hlasitosti (s návratem k jiné v "
+"případě potřeby): "
msgid "Replaygain_track_gain"
-msgstr "Zesílení skladby při vyrovnání hlasitosti"
+msgstr "Zesílit skladbu"
msgid "Replaygain_album_gain"
-msgstr "Zesílení alba při vyrovnání hlasitosti"
+msgstr "Zesílit album"
msgid "Adding files to Playlist"
-msgstr ""
+msgstr "Soubory jsou přidávány do seznamu skladeb"
msgid ""
"Use basename only instead of full path\n"
"if no metadata is available."
msgstr ""
+"Použít základní název namísto celé cesty,\n"
+"pokud nejsou dostupná žádná popisná data."
msgid "Metadata editor (File info dialog)"
msgstr "Editor popisných dat (dialog s informacemi o souboru)"
@@ -2127,20 +2281,28 @@
"When adding new frames, try to set their contents\n"
"from another tag's equivalent frame."
msgstr ""
+"Při přidávání nových oken se pokuste o nastavení jejich obsahu\n"
+"z okna značky se stejným obsahem."
msgid "MPEG audio ID3v1/ID3v2 character encoding"
-msgstr ""
+msgstr "Kódování znaků ID3v1/ID3v2 MPEG audio"
msgid "Batch update & encode (mass tagger, CD ripper, file export)"
msgstr ""
+"Hromadná aktualizace a zakódování (hromadné značkování, vytažení skladeb z "
+"CD, "
+"vyvedení souborů)"
msgid "Tags to add when creating or updating MPEG audio files:"
msgstr ""
+"Značky k přidání při vytváření nebo aktualizaci zvukových souborů MPEG:"
msgid ""
"Note: pre-existing tags will be updated even though they\n"
"might not be checked here."
msgstr ""
+"Poznámka: Již existující značky budou aktualizovány, i když zde nejsou "
+"vybrány."
msgid "CD Audio"
msgstr "Zvukové CD"
@@ -2193,13 +2355,13 @@
msgstr "Přímé připojení k internetu"
msgid "Connect via HTTP proxy"
-msgstr "Připojit se přes proxy HTTP"
+msgstr "Připojit se přes HTTP proxy"
msgid "Proxy settings"
msgstr "Nastavení proxy"
msgid "Proxy host:"
-msgstr "Server proxy:"
+msgstr "Proxy server:"
msgid "Port:"
msgstr "Přípojka:"
@@ -2208,7 +2370,7 @@
msgstr "Žádná proxy pro:"
msgid "Timeout for socket I/O:"
-msgstr "Překročení času pro socket I/O:"
+msgstr "Lhůta před považováním spojení za ztracené:"
msgid "seconds"
msgstr "sekund"
@@ -2360,7 +2522,7 @@
msgstr "Odstranit vše"
msgid "Remove dead"
-msgstr "Odstranit zaniklé"
+msgstr "Odstranit zaniklé záznamy"
msgid "Cut selected"
msgstr "Vyjmout vybrané"
@@ -2384,13 +2546,13 @@
msgstr "Odeslat do zařízení iFP"
msgid "Calculate RVA"
-msgstr "Spočítat RVA"
+msgstr "Změřit RVA"
msgid "Separate"
-msgstr "Rozdělit"
+msgstr "Jednotlivý"
msgid "Average"
-msgstr "Průměrný"
+msgstr "Průměr"
msgid "Reread file metadata"
msgstr "Přečíst popisná data znovu"
@@ -2430,7 +2592,7 @@
msgstr "Nelze odstranit %d souborů."
msgid "LADSPA patch builder"
-msgstr "Stavitel záplaty LADSPA"
+msgstr "Nastavení LADSPA"
msgid "Available plugins"
msgstr "Dostupné přídavné moduly"
@@ -2538,6 +2700,8 @@
"The information below is reported by the drive, and\n"
"may not reflect the actual capabilities of the device."
msgstr ""
+"Informace níže je hlášena mechanikou a nemusí\n"
+"odrážet skutečné schopnosti zařízení."
msgid "Eject"
msgstr "Vysunout"
@@ -2778,9 +2942,8 @@
msgid "Remove Record"
msgstr "Odstranit nahrávku"
-#, fuzzy
msgid "Remove Track"
-msgstr "Odstranit stopu"
+msgstr "Odstranit skladbu"
msgid "Update file metadata"
msgstr "Aktualizovat popisná data k souboru"
@@ -2817,6 +2980,9 @@
"File \"%s\" does not exist or your write permission has been withdrawn. "
"Check if the partition containing the store file has been unmounted."
msgstr ""
+"Soubor \"%s\" neexistuje nebo vám byla oprávnění pro zápis odňata. "
+"Prověřte, zda byl diskový oddíl obsahující soubor s hudební sbírkou "
+"odpojen."
msgid "Build / Update store from filesystem..."
msgstr "Postavit/Obnovit obchod ze souborového systému..."
@@ -3187,17 +3353,18 @@
msgstr "Zdůraznění: Zdrženlivé"
msgid "bit signed"
-msgstr "bit se znaménkem"
+msgstr "Bit se znaménkem"
msgid "bit unsigned"
-msgstr "bit bez znaménka"
+msgstr "Bit bez znaménka"
msgid "bit float"
-msgstr "bit float"
+msgstr "Bit plovoucí"
msgid "bit double"
-msgstr ""
+msgstr "Bit dvojitý"
msgid "encoding"
msgstr "Kódování"
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-08-15 10:01:41
|
Revision: 1305
http://sourceforge.net/p/aqualung/code/1305
Author: tszilagyi
Date: 2014-08-15 10:01:38 +0000 (Fri, 15 Aug 2014)
Log Message:
-----------
Add Czech translation from Pavel Fric
Modified Paths:
--------------
trunk/po/LINGUAS
trunk/src/about.c
Added Paths:
-----------
trunk/po/cs.po
Removed Paths:
-------------
trunk/src/po/
Modified: trunk/po/LINGUAS
===================================================================
--- trunk/po/LINGUAS 2014-06-14 13:28:51 UTC (rev 1304)
+++ trunk/po/LINGUAS 2014-08-15 10:01:38 UTC (rev 1305)
@@ -1 +1 @@
-de es fr hu it ja nl pl ru sv uk zh
+cs de es fr hu it ja nl pl ru sv uk zh
Added: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po (rev 0)
+++ trunk/po/cs.po 2014-08-15 10:01:38 UTC (rev 1305)
@@ -0,0 +1,3203 @@
+# Copyright (C) YEAR Tom Szilagyi
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Pavel Fric <pav...@se...>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: aqualung SVN\n"
+"Report-Msgid-Bugs-To: aqu...@li...\n"
+"POT-Creation-Date: 2014-08-14 20:42+0200\n"
+"PO-Revision-Date: 2014-08-14 23:54+0200\n"
+"Last-Translator: Pavel Fric <pav...@se...>\n"
+"Language-Team: Czech <kde...@kd...>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
+
+msgid "Optional features:"
+msgstr "Volitelné funkce:"
+
+msgid "LADSPA plugin support\n"
+msgstr ""
+
+msgid "CDDA (Audio CD) support\n"
+msgstr ""
+
+msgid "CDDB support\n"
+msgstr ""
+
+msgid "Sample Rate Converter support\n"
+msgstr ""
+
+msgid "iRiver iFP driver support\n"
+msgstr ""
+
+msgid "JACK port management support\n"
+msgstr ""
+
+msgid "Loop playback support\n"
+msgstr ""
+
+msgid "Systray support\n"
+msgstr ""
+
+msgid "Podcast support\n"
+msgstr ""
+
+msgid "Lua extension support\n"
+msgstr ""
+
+msgid "Decoding support:"
+msgstr ""
+
+msgid "sndfile (WAV, AIFF, etc.)\n"
+msgstr ""
+
+msgid "Free Lossless Audio Codec (FLAC)\n"
+msgstr ""
+
+msgid "Ogg Vorbis\n"
+msgstr ""
+
+msgid "Ogg Speex\n"
+msgstr ""
+
+msgid "MPEG Audio (MPEG 1-2.5 Layer I-III)\n"
+msgstr ""
+
+msgid "MOD Audio (MOD, S3M, XM, IT, etc.)\n"
+msgstr ""
+
+msgid "Musepack\n"
+msgstr ""
+
+msgid "Monkey's Audio Codec\n"
+msgstr ""
+
+msgid "WavPack\n"
+msgstr ""
+
+msgid "LAVC (AC3, AAC, WavPack, WMA, etc.)\n"
+msgstr ""
+
+msgid "Encoding support:"
+msgstr ""
+
+msgid "sndfile (WAV)\n"
+msgstr "sndfile (WAV)\n"
+
+msgid "LAME (MP3)\n"
+msgstr ""
+
+msgid "Output driver support:"
+msgstr ""
+
+msgid "sndio Audio\n"
+msgstr ""
+
+msgid "OSS Audio\n"
+msgstr ""
+
+msgid "ALSA Audio\n"
+msgstr ""
+
+msgid "JACK Audio Server\n"
+msgstr ""
+
+msgid "PulseAudio\n"
+msgstr ""
+
+msgid "Win32 Sound API\n"
+msgstr ""
+
+msgid "About"
+msgstr "O programu"
+
+msgid "Build version: "
+msgstr ""
+
+msgid "Homepage:"
+msgstr "Stránky projektu:"
+
+msgid "Authors:"
+msgstr "Autoři:"
+
+msgid "Core design, engineering & programming:\n"
+msgstr ""
+
+msgid "Skin support, look & feel, GUI hacks:\n"
+msgstr ""
+
+msgid "Programming, GUI engineering:\n"
+msgstr ""
+
+msgid "OpenBSD compatibility, metadata tweaks:\n"
+msgstr ""
+
+msgid "Miscellaneous, minimalism:\n"
+msgstr "Různé, minimalismus:\n"
+
+#, fuzzy
+msgid "Translators:"
+msgstr "Přeložili"
+
+msgid "Chinese (simplified):\n"
+msgstr ""
+
+msgid "Dutch:\n"
+msgstr "Holandština:\n"
+
+msgid "French:\n"
+msgstr "Francouzština:\n"
+
+msgid "German:\n"
+msgstr "Němčina:\n"
+
+msgid "Hungarian:\n"
+msgstr "Maďarština:\n"
+
+msgid "Italian:\n"
+msgstr "Italština:\n"
+
+msgid "Japanese:\n"
+msgstr "Japonština:\n"
+
+msgid "Polish:\n"
+msgstr "Polština:\n"
+
+msgid "Russian:\n"
+msgstr "Ruština:\n"
+
+msgid "Spanish:\n"
+msgstr "Španělština:\n"
+
+msgid "Swedish:\n"
+msgstr "Švédština:\n"
+
+msgid "Ukrainian:\n"
+msgstr "Ukrajinština:\n"
+
+msgid "Graphics:"
+msgstr "Grafika:"
+
+msgid "Logo, icons:\n"
+msgstr "Logo, ikony:\n"
+
+msgid "This Aqualung binary is compiled with:"
+msgstr "Tento spustitelný soubor Aqualungu je sestaven pomocí:"
+
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
+"Ave, Cambridge, MA 02139, USA."
+msgstr ""
+"Tento program je svobodným softwarem; můžete jej šířit a/nebo modifikovat\na "
+"to podle podmínek GNU General Public Licence, vydávané Free Software "
+"Foundation; buď verze 2 této licence, nebo (podle vašeho uvážení) kterékoli "
+"pozdější verze.\n\nTento program je rozšiřován v naději, že bude "
+"užitečný, ale BEZ JAKÉKOLIV ZÁRUKY; dokonce i bez předpokládané "
+"záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. viz GNU General Public "
+"License pro více informací.\n\nMěli byste obdržet kopii GNU General Public "
+"License spolu s tímto programem; pokud ne, napište na Free "
+"Software Foundation, Inc, 675 Franklin Street, Fifth Floor, Boston, MA "
+"02-139, USA."
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid "Source"
+msgstr "Zdroj"
+
+msgid "CDDB"
+msgstr "CDDB"
+
+msgid "CDDB (not available)"
+msgstr "CDDB (nedostupné)"
+
+msgid "Metadata"
+msgstr "Popisná data"
+
+msgid "Filesystem"
+msgstr "Souborový systém"
+
+msgid "Capitalization"
+msgstr "Psaní velkých písmen"
+
+msgid "Capitalize: "
+msgstr "Psát velkými písmeny: "
+
+msgid "All words"
+msgstr "Všechna slova"
+
+msgid "First word only"
+msgstr "Pouze první slovo"
+
+msgid "Force case: "
+msgstr "Vynutit velikost písmen: "
+
+msgid "Force other letters to lowercase"
+msgstr "Vynutit malá písmena"
+
+#, fuzzy
+msgid "Regular expression"
+msgstr "Regulární výraz"
+
+msgid "Regexp:"
+msgstr "Regulární výraz:"
+
+msgid "Replace:"
+msgstr "Nahradit:"
+
+msgid "Predefined transformations"
+msgstr "Předem stanovené proměny"
+
+msgid "Remove file extension"
+msgstr "Odstranit příponu souboru"
+
+msgid "Remove leading number"
+msgstr "Odstranit číslo na začátku"
+
+msgid "Convert underscore to space"
+msgstr "Převést podtržítko na mezeru"
+
+msgid "Trim leading, tailing and duplicate spaces"
+msgstr "Oříznout mezery na začátku, na konci a zdvojené mezery"
+
+msgid "Regexp matches empty string"
+msgstr ""
+
+msgid "Please select the root directory."
+msgstr ""
+
+msgid "Select build type"
+msgstr ""
+
+msgid "Directory driven"
+msgstr ""
+
+msgid ""
+"Follows the directory structure to identify the artists and\n"
+"records. The files are added on a record basis."
+msgstr ""
+
+msgid "Independent"
+msgstr ""
+
+msgid ""
+"Recursive search from the root directory for audio files.\n"
+"The files are processed independently, so only metadata\n"
+"and filename transformation are available."
+msgstr ""
+
+msgid "Load settings from Music Store file"
+msgstr ""
+
+msgid "Build/Update store"
+msgstr ""
+
+msgid "General"
+msgstr "Obecné"
+
+msgid "Directory structure"
+msgstr ""
+
+msgid "Root path:"
+msgstr ""
+
+msgid "_Browse..."
+msgstr "_Procházet..."
+
+msgid "Structure:"
+msgstr "Stavba:"
+
+msgid "root / record / track"
+msgstr ""
+
+msgid "root / artist / record / track"
+msgstr ""
+
+msgid "root / artist / artist / record / track"
+msgstr ""
+
+msgid "root / artist / artist / artist / record / track"
+msgstr ""
+
+msgid "Exclude files matching wildcard"
+msgstr ""
+
+msgid "Include only files matching wildcard"
+msgstr ""
+
+msgid "Reread data for existing tracks"
+msgstr ""
+
+msgid "Remove non-existing files from store"
+msgstr ""
+
+msgid "Artist"
+msgstr "Umělec"
+
+msgid "Sort artists by"
+msgstr ""
+
+msgid "Artist name"
+msgstr "Jméno umělce"
+
+msgid "Artist name (lowercase)"
+msgstr ""
+
+msgid "Directory name"
+msgstr "Název adresáře"
+
+msgid "Directory name (lowercase)"
+msgstr "Název adresáře (malá písmena)"
+
+msgid "Record"
+msgstr "Nahrávat"
+
+msgid "Sort records by"
+msgstr "Řadit nahrávky dle"
+
+msgid "Record name"
+msgstr "Název nahrávky"
+
+msgid "Record name (lowercase)"
+msgstr "Název nahrávky (malá písmena)"
+
+msgid "Year"
+msgstr "Rok"
+
+msgid "Add year to the comments of new records"
+msgstr ""
+
+msgid "Track"
+msgstr "Skladba"
+
+msgid "Import Replaygain tag as manual RVA"
+msgstr "Zavést značku vyrovnání hlasitosti jako ruční RVA"
+
+msgid "Import Comment tag"
+msgstr "Zavést značku poznámky"
+
+msgid "Sandbox"
+msgstr "Pískoviště"
+
+#, fuzzy
+msgid "Filename:"
+msgstr "Název souboru:"
+
+msgid "Test"
+msgstr "Zkouška"
+
+msgid "Building store from filesystem"
+msgstr ""
+
+msgid "Processing:"
+msgstr "Zpracování:"
+
+msgid "Action:"
+msgstr "Činnost:"
+
+msgid "Abort"
+msgstr "Přerušit"
+
+msgid "Unknown Artist"
+msgstr "Neznámý umělec"
+
+msgid "Unknown Record"
+msgstr "Neznámá nahrávka"
+
+msgid "Scanning files"
+msgstr "Prohledávají se soubory"
+
+msgid "Processing metadata"
+msgstr "Zpracovávají se popisná data"
+
+msgid "CDDB lookup"
+msgstr "Vyhledání v CDDB"
+
+msgid "Name transformation"
+msgstr "Proměna názvu"
+
+msgid "Reading file"
+msgstr "Čte se soubor"
+
+msgid "Removing non-existing files"
+msgstr "Odstraňují se neexistující soubory"
+
+msgid "Please select the directory for ripped files."
+msgstr "Vyberte, prosím, adresář pro z nosiče vytažené soubory."
+
+msgid "(none)"
+msgstr "(žádné)"
+
+msgid "fast"
+msgstr "Rychlé"
+
+msgid "best"
+msgstr "Nejlepší"
+
+msgid "Compression level:"
+msgstr "Úroveň komprese:"
+
+msgid "Bitrate [kbps]:"
+msgstr "Datový tok (kb/s):"
+
+msgid "Artist/Album already existing, not empty"
+msgstr ""
+
+msgid ""
+"\n"
+"The Music Store you selected has a matching Artist and Album, already "
+"containing some tracks. If you press OK, these tracks will be removed. The "
+"files themselves will be left intact, but they will be removed from the "
+"destination Music Store. Press Cancel to get back to change the Artist/Album "
+"or the destination Music Store."
+msgstr ""
+
+msgid "Rip CD"
+msgstr ""
+
+msgid "Artist:"
+msgstr "Umělec:"
+
+msgid "Album:"
+msgstr "Album:"
+
+msgid "Year:"
+msgstr "Rok:"
+
+msgid "Genre:"
+msgstr "Žánr:"
+
+msgid "Rip"
+msgstr "Vytáhnout"
+
+msgid "No."
+msgstr "Číslo"
+
+msgid "Title"
+msgstr "Název"
+
+msgid "Select"
+msgstr "Vybrat"
+
+msgid "All"
+msgstr "Vše"
+
+msgid "None"
+msgstr "Žádný"
+
+msgid "Output"
+msgstr "Výstup"
+
+msgid "Destination"
+msgstr "Cíl"
+
+msgid "Target directory for ripped files"
+msgstr "Cílový adresář pro vytažené soubory"
+
+msgid "Add to Music Store"
+msgstr "Přidat do hudebního obchodu"
+
+msgid "Format"
+msgstr "Formát"
+
+msgid "File format:"
+msgstr "Souborový formát:"
+
+msgid "VBR encoding"
+msgstr "Kódování PDT"
+
+msgid "Tag files with metadata"
+msgstr "Soubory značek s popisnými daty"
+
+msgid "Paranoia"
+msgstr "Paranoia"
+
+msgid "Paranoia error correction"
+msgstr "Oprava chyb Paranoia"
+
+msgid "Perform overlapped reads"
+msgstr "Provést překrývající se čtení"
+
+msgid "Verify data integrity"
+msgstr "Ověřit celistvost dat"
+
+msgid "Unlimited retry on failed reads (never skip)"
+msgstr ""
+
+msgid "Maximum number of retries:"
+msgstr "Nejvyšší počet opakovaných pokusů:"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid ""
+"\n"
+"Destination directory is not read-write accessible!"
+msgstr ""
+
+msgid "Total"
+msgstr "Celkem"
+
+msgid "(audio only)"
+msgstr "(pouze zvuk)"
+
+msgid "Ripping CD tracks"
+msgstr "Vytahují se skladby z CD"
+
+msgid "Begin"
+msgstr "Začátek"
+
+msgid "Length"
+msgstr "Délka"
+
+msgid "Progress"
+msgstr "Postup"
+
+msgid "Close window when complete"
+msgstr "Zavřít okno, až bude hotovo"
+
+msgid "Close"
+msgstr "Zavřít"
+
+msgid "Unknown disc"
+msgstr "Neznámý disk"
+
+msgid "No disc"
+msgstr "Žádný disk"
+
+msgid "CDDB query"
+msgstr "Dotaz na CDDB"
+
+msgid "Retrieving matches from server..."
+msgstr ""
+
+msgid "Connecting to CDDB server..."
+msgstr "Spojuje se se serverem CDDB..."
+
+msgid "An error occurred while attempting to connect to the CDDB server."
+msgstr ""
+
+msgid "Warning"
+msgstr "Varování"
+
+msgid "No matching record found."
+msgstr "Nebyla nalezena žádná odpovídající nahrávka."
+
+msgid "Import as Sort Key"
+msgstr "Zavést jako Třídící klíč"
+
+msgid "Import as Title"
+msgstr "Zavést jako Název"
+
+msgid "Import as Year"
+msgstr "Zavést jako Rok"
+
+msgid ""
+"Artist appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid ""
+"Artist appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid ""
+"Title appears to be in all lowercase.\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid ""
+"Title appears to be in all uppercase.\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid ""
+"It is very likely that the year is wrong.\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid "The email address provided for submission is invalid."
+msgstr ""
+
+msgid "An error occurred while submitting the record to the CDDB server."
+msgstr ""
+
+msgid "Correct existing record"
+msgstr ""
+
+msgid "Submit new record"
+msgstr ""
+
+msgid "Matches:"
+msgstr "Shody:"
+
+msgid "Title:"
+msgstr "Název:"
+
+msgid "Category:"
+msgstr "Skupina:"
+
+msgid "(choose a category)"
+msgstr "(vybrat skupinu)"
+
+msgid "Extended data:"
+msgstr "Rozšířená data:"
+
+msgid "Import as Artist"
+msgstr "Zavést jako Umělec"
+
+msgid "Add to Comments"
+msgstr "Přidat do poznámek"
+
+msgid "Tracks"
+msgstr "Skladby"
+
+msgid "You have to provide an email address for CDDB submission."
+msgstr ""
+
+msgid "Unknown Album"
+msgstr "Neznámé album"
+
+msgid "Unknown Track"
+msgstr "Neznámá skladba"
+
+msgid "Please select the directory for exported files."
+msgstr ""
+
+msgid "Copy"
+msgstr "Kopírovat"
+
+msgid "Help"
+msgstr "Nápověda"
+
+#, c-format
+msgid ""
+"\n"
+"The template string you enter here will be used to construct the filename of "
+"the exported files. The Original filename, Artist, Record and Track names "
+"are denoted by %%o, %%a, %%r and %%t. The track number and format-dependent "
+"file extension are denoted by %%n and %%x, respectively. %%i gives an "
+"identifier which is unique within an export session."
+msgstr ""
+
+msgid "Exporting files"
+msgstr ""
+
+msgid "Source file:"
+msgstr "Zdrojový soubor:"
+
+msgid "Target file:"
+msgstr "Cílový soubor:"
+
+msgid "Progress:"
+msgstr "Postup:"
+
+msgid "Error in format string"
+msgstr ""
+
+msgid "Export files"
+msgstr "Vyvést soubory"
+
+msgid "Location and filename"
+msgstr ""
+
+msgid "Target directory:"
+msgstr "Cílový adresář:"
+
+msgid "Create subdirectories for artists"
+msgstr "Vytvořit podadresáře pro umělce"
+
+msgid "Create subdirectories for albums"
+msgstr "Vytvořit podadresáře pro alba"
+
+msgid ""
+"Subdirectory name\n"
+"length limit:"
+msgstr ""
+
+msgid "Filename template:"
+msgstr ""
+
+msgid "Filter"
+msgstr "Filtr"
+
+msgid "Do not reencode files already being in the target format"
+msgstr ""
+
+msgid ""
+"Do not reencode files\n"
+"matching wildcard:"
+msgstr ""
+
+msgid "*File info"
+msgstr "*Informace o souboru"
+
+msgid "File info"
+msgstr "Informace o souboru"
+
+msgid "There are unsaved changes to the file metadata."
+msgstr ""
+
+msgid "Save and close"
+msgstr "Uložit a zavřít"
+
+msgid "Discard changes"
+msgstr "Zahodit změny"
+
+msgid "Do not close"
+msgstr "Nezavírat"
+
+#, c-format
+msgid ""
+"Conversion error in field %s:\n"
+"'%s' does not conform to format '%s'!"
+msgstr ""
+
+msgid ""
+"Attached Picture frame with no image set!\n"
+"Please set an image or remove the frame."
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to write metadata to file.\n"
+"Reason: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error converting field %s to Year:\n"
+"'%s' is not an integer number!"
+msgstr ""
+
+msgid "Please specify the file to save the image to."
+msgstr ""
+
+msgid "(no image)"
+msgstr ""
+
+msgid "(error loading image)"
+msgstr "(chyba při nahrávání obrázku)"
+
+msgid "Please specify the file to load the image from."
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not load image from:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "MIME type: %s"
+msgstr "MIME typ: %s"
+
+msgid "Picture type:"
+msgstr "Druh obrázku:"
+
+msgid "Description:"
+msgstr "Popis:"
+
+msgid "(no description)"
+msgstr "(bez popisu)"
+
+msgid "Change"
+msgstr "Změnit"
+
+msgid "Save"
+msgstr "Uložit"
+
+msgid "Import as Record"
+msgstr "Zavést jako Nahrávka"
+
+msgid "Import as Track No."
+msgstr "Zavést jako Skladba číslo"
+
+msgid "Import as RVA"
+msgstr "Zavést jako RVA"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "field:"
+msgstr "Pole:"
+
+msgid "tag:"
+msgstr "Značka:"
+
+#, c-format
+msgid "%ld Hz"
+msgstr "%ld Hz"
+
+msgid "MONO"
+msgstr "Mono"
+
+msgid "STEREO"
+msgstr "Stereo"
+
+msgid "Audio CD"
+msgstr "Zvukové CD"
+
+msgid "Track:"
+msgstr "Skladba:"
+
+msgid "File:"
+msgstr "Soubor:"
+
+msgid "Audio data"
+msgstr "Zvuková data"
+
+msgid "Format:"
+msgstr "Formát:"
+
+msgid "Length:"
+msgstr "Délka:"
+
+msgid "Samplerate:"
+msgstr "Vzorkovací kmitočet:"
+
+msgid "Channel count:"
+msgstr "Počet kanálů:"
+
+msgid "Bandwidth:"
+msgstr "Šířka pásma:"
+
+msgid "Total samples:"
+msgstr "Celkem vzorků:"
+
+msgid "Mode:"
+msgstr "Režim:"
+
+msgid "Type:"
+msgstr "Typ:"
+
+msgid "Channels:"
+msgstr "Kanály:"
+
+msgid "Patterns:"
+msgstr "Vzory:"
+
+msgid "Samples:"
+msgstr "Vzorky:"
+
+msgid "Instruments:"
+msgstr "Nástroje:"
+
+msgid "Samples"
+msgstr "Vzorky"
+
+msgid "Instruments"
+msgstr "Nástroje"
+
+msgid "Name"
+msgstr "Název"
+
+msgid "STOPPING"
+msgstr "Zastavuje se"
+
+msgid "Output:"
+msgstr "Výstup:"
+
+msgid "No output"
+msgstr "Žádný výstup"
+
+msgid "SRC Type: "
+msgstr "Typ SRC: "
+
+#, c-format
+msgid "Loop range: %d-%d%% [%s - %s]"
+msgstr "Rozsah smyčky: %d-%d%% [%s - %s]"
+
+#, c-format
+msgid "Loop range: %d-%d%%"
+msgstr "Rozsah smyčky: %d-%d%%"
+
+msgid ""
+"One or more stores in Music Store have been modified.\n"
+"Do you want to save them before exiting?"
+msgstr ""
+
+msgid "Do not exit"
+msgstr "Neukončovat"
+
+msgid "Quit"
+msgstr "Ukončit"
+
+#, c-format
+msgid "Position: %d%%"
+msgstr "Poloha: %d%%"
+
+#, c-format
+msgid "Mute"
+msgstr "Ztlumit"
+
+#, c-format
+msgid "%d dB"
+msgstr "%3d dB"
+
+#, c-format
+msgid "Volume: %s"
+msgstr "Hlasitost: %s"
+
+#, c-format
+msgid "%d%% R"
+msgstr "%d%% P"
+
+#, c-format
+msgid "%d%% L"
+msgstr "%d%% L"
+
+#, c-format
+msgid "C"
+msgstr "C"
+
+#, c-format
+msgid "Balance: %s"
+msgstr "Vyvážení: %s"
+
+msgid "JACK connection lost"
+msgstr "Spojení s JACKem ztraceno"
+
+#, c-format
+msgid "JACK has either been shutdown or it disconnected Aqualung. Reason: %s"
+msgstr ""
+
+msgid "Warn me if the Window Manager does not support system tray"
+msgstr ""
+
+msgid ""
+"Aqualung is compiled with system tray support, but the status icon could not "
+"be embedded in the notification area. Your desktop may not have support for "
+"a system tray, or it has not been configured correctly."
+msgstr ""
+
+msgid "Settings"
+msgstr "Nastavení"
+
+msgid "Skin chooser"
+msgstr "Volič vzhledu"
+
+msgid "JACK port setup"
+msgstr "Nastavení přípojky JACK"
+
+msgid "Previous song"
+msgstr "Předchozí píseň"
+
+msgid "Stop"
+msgstr "Zastavit"
+
+msgid "Next song"
+msgstr "Další píseň"
+
+msgid "Play/Pause"
+msgstr "Přehrát/Pozastavit"
+
+msgid "Play"
+msgstr "Přehrát"
+
+msgid "Pause"
+msgstr "Pozastavit"
+
+msgid "Repeat current song"
+msgstr "Opakovat nynější píseň"
+
+msgid "Repeat all songs"
+msgstr "Opakovat všechny písně"
+
+msgid "Shuffle songs"
+msgstr "Zamíchat písně"
+
+msgid "Toggle playlist"
+msgstr "Přepnout seznam skladeb"
+
+msgid "Toggle music store"
+msgstr "Přepnout hudební obchod"
+
+msgid "Toggle LADSPA patch builder"
+msgstr "Přepnout stavitele záplaty LADSPA"
+
+msgid "Show Aqualung"
+msgstr "Ukázat Aqualung"
+
+msgid "Hide Aqualung"
+msgstr "Skrýt Aqualung"
+
+msgid "Previous"
+msgstr "Předchozí"
+
+msgid "Next"
+msgstr "Další"
+
+#, c-format
+msgid "%.1f MB / %.1f MB"
+msgstr "%.1f MB / %.1f MB"
+
+#, c-format
+msgid "%d / %d files"
+msgstr "%d / %d souborů"
+
+#, c-format
+msgid "%d / %d directories"
+msgstr "%d / %d adresářů"
+
+msgid "Cannot write to selected directory. Please select another directory."
+msgstr "Nelze zapisovat do vybraného adresáře. Vyberte, prosím, jiný adresář."
+
+msgid "Done"
+msgstr "Hotovo"
+
+msgid "Aborted..."
+msgstr "Zrušeno..."
+
+msgid "Please enter directory name."
+msgstr "Zadejte, prosím, název adresáře."
+
+msgid "Create directory"
+msgstr "Vytvořit adresář"
+
+msgid "Please enter a new name."
+msgstr "Zadejte, prosím, nový název."
+
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#, c-format
+msgid ""
+"Directory '%s' will be removed with its entire contents.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+#, c-format
+msgid ""
+"File '%s' will be removed.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid "Remove"
+msgstr "Odstranit"
+
+#, c-format
+msgid " (%.1f MB)"
+msgstr " (%.1f MB)"
+
+#, c-format
+msgid " (capacity = %.1f MB)"
+msgstr " (kapacita = %.1f MB)"
+
+#, c-format
+msgid " Free space (%.1f MB)"
+msgstr " Volné místo (%.1f MB)"
+
+msgid ""
+"No suitable iRiver iFP device found.\n"
+"Perhaps it is unplugged or turned off."
+msgstr ""
+
+msgid ""
+"Device is busy.\n"
+"(Aqualung was unable to claim its interface.)"
+msgstr ""
+
+msgid ""
+"Device is not responding.\n"
+"Try jiggling the handle."
+msgstr ""
+
+msgid "Please select a local path."
+msgstr ""
+
+msgid "Please select at least one valid song from playlist."
+msgstr ""
+
+#, c-format
+msgid ""
+"One song has format unsupported by your player.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%d of %d songs have format unsupported by your player.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The selected song has format unsupported by your player.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+#, c-format
+msgid ""
+"None of the selected songs has format supported by your player.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+
+msgid "iFP device manager (upload mode)"
+msgstr ""
+
+msgid "iFP device manager (download mode)"
+msgstr ""
+
+msgid "Selected files:"
+msgstr "Vybrané soubory:"
+
+msgid "<b>Songs info</b>"
+msgstr "<b>Informace o písni</b>"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Battery"
+msgstr "Baterie"
+
+msgid "Free space"
+msgstr "Volné místo"
+
+msgid "<b>Device status</b>"
+msgstr "<b>Stav zařízení</b>"
+
+msgid "Size"
+msgstr "Velikost"
+
+msgid "Create a new directory"
+msgstr "Vytvořit nový adresář"
+
+msgid "<b>Remote directory</b>"
+msgstr "<b>Vzdálený adresář</b>"
+
+msgid "<b>Local directory</b>"
+msgstr "<b>Místní adresář</b>"
+
+msgid "Browse"
+msgstr "Procházet"
+
+msgid "File name: "
+msgstr "Název souboru: "
+
+msgid "Current file: "
+msgstr "Nynější soubor: "
+
+msgid "Overall: "
+msgstr "Celkem: "
+
+msgid "Idle"
+msgstr "Nečinný"
+
+msgid "<b>Transfer progress</b>"
+msgstr "<b>Postup přenosu</b>"
+
+msgid "Close window when transfer complete"
+msgstr "Zavřít okno po dokončení přenosu"
+
+msgid "_Upload"
+msgstr "_Nahrát"
+
+msgid "_Download"
+msgstr "_Stáhnout"
+
+msgid "_Abort"
+msgstr "_Přerušit"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Genre"
+msgstr "Žánr"
+
+msgid "Track No."
+msgstr "Číslo skladby"
+
+msgid "Comment"
+msgstr "Poznámka"
+
+msgid "Disc"
+msgstr "Disk"
+
+msgid "Performer"
+msgstr "Účinkující"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Organization"
+msgstr "Organizace"
+
+msgid "Location"
+msgstr "Umístění"
+
+msgid "Contact"
+msgstr "Spojení"
+
+msgid "License"
+msgstr "Povolení"
+
+msgid "Copyright"
+msgstr "Autorské právo"
+
+msgid "ISRC"
+msgstr "ISRC"
+
+msgid "Version"
+msgstr "Verze"
+
+msgid "Subtitle"
+msgstr "Podnázev"
+
+msgid "Debut Album"
+msgstr "První veřejné album"
+
+msgid "Publisher"
+msgstr "Vydavatel"
+
+msgid "Conductor"
+msgstr "Dirigent"
+
+msgid "Composer"
+msgstr "Skladatel"
+
+msgid "Publication Right"
+msgstr "Právo k vydání"
+
+msgid "File"
+msgstr "Soubor"
+
+msgid "EAN/UPC"
+msgstr "EAN/UPC"
+
+msgid "ISBN"
+msgstr "ISBN"
+
+msgid "Catalog Number"
+msgstr "Katalogové číslo"
+
+msgid "Label Code"
+msgstr "Kód hudebního vydavatelství"
+
+msgid "Record Date"
+msgstr "Datum nahrávání"
+
+msgid "Record Location"
+msgstr "Místo nahrávání"
+
+#, fuzzy
+msgid "Media"
+msgstr "Hudební soubory"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "Related"
+msgstr ""
+
+msgid "Abstract"
+msgstr ""
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Bibliography"
+msgstr "Soupis tištěných pramenů"
+
+msgid "Introplay"
+msgstr "Předehra"
+
+msgid "BPM"
+msgstr "ÚZM"
+
+msgid "Encoding Time"
+msgstr "Čas zakódování"
+
+msgid "Playlist Delay"
+msgstr "Zpoždění seznamu skladeb"
+
+msgid "Original Release Time"
+msgstr "Původní čas vydání"
+
+msgid "Release Time"
+msgstr "Čas vydání"
+
+msgid "Tagging Time"
+msgstr "Čas opatření značkami"
+
+msgid "Encoded by"
+msgstr "Zakódováno"
+
+msgid "Lyricist/Text Writer"
+msgstr "Textař/Skladatel textu"
+
+msgid "File Type"
+msgstr "Typ souboru"
+
+msgid "Involved People"
+msgstr "Zúčastněné osoby"
+
+msgid "Content Group"
+msgstr "Skupina obsahu"
+
+msgid "Initial key"
+msgstr "Tónina na začátku"
+
+msgid "Musician Credits"
+msgstr "Seznam hudebníků"
+
+msgid "Mood"
+msgstr "Nálada"
+
+msgid "Original Album"
+msgstr "Původní album"
+
+msgid "Original Filename"
+msgstr "Původní název souboru"
+
+msgid "Original Lyricist"
+msgstr "Původní textař"
+
+msgid "Original Artist"
+msgstr "Původní umělec"
+
+msgid "File Owner"
+msgstr "Vlastník souboru"
+
+msgid "Band/Orchestra"
+msgstr "Hudební skupina/Orchestr"
+
+msgid "Interpreted/Remixed"
+msgstr "Umělecky ztvárněno/Znovu zamícháno"
+
+msgid "Part Of A Set"
+msgstr "Část sady"
+
+msgid "Produced"
+msgstr "Vydáno"
+
+msgid "Internet Radio Station Name"
+msgstr "Název internetové rozhlasové stanice"
+
+msgid "Internet Radio Station Owner"
+msgstr "Vlastník internetové rozhlasové stanice"
+
+msgid "Album Sort Order"
+msgstr "Setřídění alb"
+
+msgid "Performer Sort Order"
+msgstr "Setřídění účinkujících"
+
+msgid "Title Sort Order"
+msgstr "Setřídění názvů"
+
+msgid "Software"
+msgstr "Program"
+
+msgid "Set Subtitle"
+msgstr "Nastavit podnázev"
+
+msgid "User Defined Text"
+msgstr "Uživatelsky stanovený text"
+
+msgid "Commercial Information"
+msgstr "Obchodní sdělení"
+
+msgid "Copyright/Legal Information"
+msgstr "Autorské právo/Zákonná sdělení"
+
+msgid "Official Audio File Website"
+msgstr "Veřejné internetové stránky zvukového souboru"
+
+msgid "Official Artist Website"
+msgstr "Veřejné internetové stránky umělce"
+
+msgid "Official Audio Source Website"
+msgstr "Veřejné internetové stránky zvukového zdroje"
+
+msgid "Official Radio Station Website"
+msgstr "Veřejné internetové stránky radiostanice"
+
+msgid "Payment"
+msgstr "Platba"
+
+msgid "Publisher's Official Website"
+msgstr "Veřejné internetové stránky vydavatele"
+
+msgid "User Defined URL"
+msgstr "Uživatelsky stanovená adresa (URL)"
+
+msgid "Vendor"
+msgstr "Prodejce"
+
+msgid "ReplayGain Reference Loudness"
+msgstr "Určující hlasitost při vyrovnání hlasitosti"
+
+msgid "ReplayGain Track Gain"
+msgstr "Zesílení skladby při vyrovnání hlasitosti"
+
+msgid "ReplayGain Track Peak"
+msgstr "Vrchol skladby při vyrovnání hlasitosti"
+
+msgid "ReplayGain Album Gain"
+msgstr "Zesílení alba při vyrovnání hlasitosti"
+
+msgid "ReplayGain Album Peak"
+msgstr "Vrchol alba při vyrovnání hlasitosti"
+
+msgid "Icy-Name"
+msgstr ""
+
+msgid "Icy-Description"
+msgstr ""
+
+msgid "Icy-Genre"
+msgstr ""
+
+msgid "RVA"
+msgstr "RVA"
+
+msgid "Attached Picture"
+msgstr "Připojený obrázek"
+
+msgid "Binary Object"
+msgstr "Binární objekt"
+
+#, fuzzy
+msgid "NULL"
+msgstr "Plná"
+
+msgid "ID3v1"
+msgstr "ID3v1"
+
+msgid "ID3v2"
+msgstr "ID3v2"
+
+msgid "APE"
+msgstr "APE"
+
+msgid "Ogg Xiph Comments"
+msgstr "Poznámky Xiph Ogg"
+
+msgid "FLAC Pictures"
+msgstr "Obrázky FLAC"
+
+msgid "Musepack ReplayGain"
+msgstr "Vyrovnání hlasitosti Musepack"
+
+msgid "Generic StreamMeta"
+msgstr "Obecná StreamMeta"
+
+msgid "MPEG StreamMeta"
+msgstr "MPEG StreamMeta"
+
+msgid "Module info"
+msgstr "Informace o modulu"
+
+msgid "Unknown"
+msgstr "Neznámý"
+
+msgid "Success"
+msgstr "Úspěch"
+
+msgid "Memory allocation error"
+msgstr "Chyba při přidělování paměti"
+
+msgid "Unable to open file"
+msgstr "Nelze otevřít soubor"
+
+msgid "No metadata support for this format"
+msgstr "Pro tento formát není žádná podpora pro popisná data"
+
+msgid "File is not writable"
+msgstr "Soubor není zapisovatelný"
+
+msgid "Invalid 'Track no.' field value"
+msgstr "Neplatná hodnota pole Číslo skladby"
+
+msgid "Invalid 'Genre' field value"
+msgstr "Neplatná hodnota pole Žánr"
+
+msgid "Conversion to target charset failed"
+msgstr "Převod do cílové znakové sady se nezdařil"
+
+msgid "Internal error"
+msgstr "Vnitřní chyba"
+
+msgid "Unknown error"
+msgstr "Neznámá chyba"
+
+msgid "Other"
+msgstr "Jiné"
+
+msgid "File icon (32x32 PNG)"
+msgstr "Ikona souboru (32 x 32 PNG)"
+
+msgid "File icon (other)"
+msgstr "Ikona souboru (jiné)"
+
+msgid "Front cover"
+msgstr "Přední strana obalu"
+
+msgid "Back cover"
+msgstr "Zadní strana obalu"
+
+msgid "Leaflet page"
+msgstr "Strana letáku"
+
+msgid "Album image"
+msgstr "Obrázek alba"
+
+msgid "Lead artist/performer"
+msgstr "Hlavní umělec/Účinkující"
+
+msgid "Artist/performer"
+msgstr "Umělec/Účinkující"
+
+msgid "Band/orchestra"
+msgstr "Hudební skupina/Orchestr"
+
+msgid "Lyricist/text writer"
+msgstr "Textař/Skladatel textu"
+
+msgid "Recording location/studio"
+msgstr "Místo nahrávky/Studio"
+
+msgid "During recording"
+msgstr "Během nahrávání"
+
+msgid "During performance"
+msgstr "Během vystoupení"
+
+msgid "Movie/video screen capture"
+msgstr "Obrázek z filmu/videa"
+
+msgid "A large, coloured fish"
+msgstr "Obrázek velké pestrobarevné ryby"
+
+msgid "Illustration"
+msgstr "Ilustrace"
+
+msgid "Band/artist logotype"
+msgstr "Značka hudební skupiny/umělce"
+
+msgid "Publisher/studio logotype"
+msgstr "Značka vydavatele/nahrávacího studia"
+
+msgid "Music Store"
+msgstr "Hudební obchod"
+
+msgid "Search..."
+msgstr "Hledat..."
+
+msgid "Collapse all items"
+msgstr "Složit všechny položky"
+
+msgid "Edit item..."
+msgstr "Upravit položku..."
+
+msgid "Add item..."
+msgstr "Přidat položku..."
+
+msgid "Remove item..."
+msgstr "Odstranit položku..."
+
+msgid "Save all stores"
+msgstr "Uložit všechny obchody"
+
+msgid "Create empty store..."
+msgstr "Vytvořit prázdný obchod..."
+
+msgid "*Music Store"
+msgstr "*Hudební obchod"
+
+#, c-format
+msgid "Do you want to save store \"%s\" before removing from Music Store?"
+msgstr ""
+
+msgid ""
+"You will need to restart Aqualung for the following changes to take effect:"
+msgstr ""
+
+msgid "Select a font..."
+msgstr ""
+
+msgid "Disable skin support"
+msgstr "Zakázat podporu vzhledu"
+
+msgid "rw"
+msgstr "rw"
+
+msgid "r"
+msgstr "r"
+
+msgid "unreachable"
+msgstr "nedosažitelný"
+
+msgid "Please select a Lua Extension File."
+msgstr "Vyberte, prosím, soubor s příponou Lua"
+
+msgid "Please select a Music Store database."
+msgstr "Vyberte, prosím, databázi Hudební obchod."
+
+msgid "Paths must either be absolute or starting with a tilde."
+msgstr ""
+
+msgid "The specified store has already been added to the list."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"The template string you enter here will be used to construct a single title "
+"line from an Artist, a Record and a Track name. These are denoted by %%a, "
+"%%r and %%t, respectively.\n"
+msgstr ""
+
+msgid ""
+"\n"
+"If you have non-standard ID3v1/ID3v2 character encoding MPEG audio file, "
+"please enter suitable character encoding in this entry (see below). If this "
+"entry is blank, the standard character encoding (ISO-8859-1) is used.\n"
+"\n"
+"For example:\n"
+" Japanese: CP932 (SHIFT_JIS variant)\n"
+" Korean: EUC-KR\n"
+" Simp. Chinese: GB2312\n"
+" Trad. Chinese: BIG5\n"
+" Greek: ISO-8859-7\n"
+" Hebrew: ISO-8859-8\n"
+" Cyrillic: CP1251\n"
+" Thai: ISO-8859-11\n"
+" Arabic: CP1256\n"
+" Turkish: ISO-8859-9\n"
+" Latin Extended: ISO-8859-2\n"
+" Central European: CP1250\n"
+" Latin1 (standard): ISO-8859-1\n"
+"\n"
+"NOTE: There might be a more suitable character encoding for your language."
+msgstr ""
+
+msgid ""
+"\n"
+"The file you enter/choose here will set the Lua program to use to extend "
+"Aqualung. See the Aqualung manual for details. Here is a quick example of "
+"what you can use in the file:\n"
+"\n"
+"function playlist_title()\n"
+" return m('artist') .. '-' .. m('title') .. ' (' .. m('album') .. ') (' .. i"
+"('filename') .. ')'\n"
+"end"
+msgstr ""
+
+msgid ""
+"\n"
+"The string you enter here will be parsed as a command line before parsing "
+"the actual command line parameters. What you enter here will act as a "
+"default setting and may or may not be overridden from the 'real' command "
+"line.\n"
+"\n"
+"Example: enter '-o alsa -R' below to use ALSA output running realtime as a "
+"default.\n"
+msgstr ""
+
+msgid ""
+"Paths must either be absolute or starting with a tilde, which will be "
+"expanded to the user's home directory.\n"
+"\n"
+"Drag and drop entries in the list to set the store order in the Music Store."
+msgstr ""
+
+msgid ""
+"\n"
+"Set the drive speed for CD playing in CD-ROM speed units. One speed unit "
+"equals to 176 kBps raw data reading speed. Warning: not all drives honor "
+"this setting.\n"
+"\n"
+"Lower speed usually means less drive noise. However, when using Paranoia "
+"error correction modes for increased accuracy, generally much larger speeds "
+"are required to prevent buffer underruns (and thus audible drop-outs).\n"
+"\n"
+"Please note that these settings do not apply to CD Ripping, which always "
+"happens with maximum available speed and with error correction modes "
+"manually set before every run."
+msgstr ""
+
+msgid ""
+"\n"
+"Most drives let Aqualung know when a CD has been inserted or removed by "
+"providing a 'media changed' flag. However, some drives don't set this flag "
+"properly, and thus it may happen that a newly inserted CD remains unnoticed "
+"to Aqualung. In such cases, enabling this option should help."
+msgstr ""
+
+msgid ""
+"\n"
+"Here you should enter a comma-separated list of domains\n"
+"that should be accessed without using the proxy set above.\n"
+"Example: localhost, .localdomain, .my.domain.com"
+msgstr ""
+
+msgid "Embed playlist into main window"
+msgstr "Vložit seznam skladeb do hlavního okna"
+
+msgid "Enable systray"
+msgstr "Povolit oznamovací oblast panelu"
+
+msgid "Do nothing"
+msgstr "Nedělat nic"
+
+msgid "Change volume"
+msgstr "Změnit hlasitost"
+
+msgid "Change balance"
+msgstr "Změnit vyvážení"
+
+msgid "Change song position"
+msgstr "Změnit polohu písně"
+
+msgid "Change current song"
+msgstr "Změnit nynější píseň"
+
+msgid "Left button"
+msgstr "Levé tlačítko"
+
+msgid "Middle button"
+msgstr "Prostřední tlačítko"
+
+msgid "Right button"
+msgstr "Pravé tlačítko"
+
+msgid "Button"
+msgstr "Tlačítko"
+
+msgid "Left and right mouse buttons are reserved."
+msgstr "Levé a pravé tlačítko je vyhrazeno."
+
+msgid "This button is already assigned."
+msgstr "Toto tlačítko je již přiřazeno."
+
+msgid "Add mouse button command"
+msgstr "Přidat příkaz pro tlačítko myši"
+
+msgid "Mouse button"
+msgstr "Tlačítko myši"
+
+msgid "Click here to set mouse button"
+msgstr "Klepněte sem pro nastavení tlačítka myši"
+
+msgid "Command"
+msgstr "Příkaz"
+
+msgid "Error in title format string"
+msgstr "Chyba v řetězci formátu názvu"
+
+msgid "Error invalid character encoding"
+msgstr "Chyba. Neplatné kódování znaků"
+
+msgid "Main window"
+msgstr "Hlavní okno"
+
+msgid "Disable control buttons relief"
+msgstr ""
+
+msgid "Combine play and pause buttons"
+msgstr "Sloučit tlačítko pro přehrávání a pozastavení"
+
+msgid "Keep main window always on top"
+msgstr "Ponechat hlavní okno vždy nahoře"
+
+msgid "Show song name in the main window's title"
+msgstr "Ukázat název písně v názvu hlavního okna"
+
+msgid "Title Format"
+msgstr "Formát názvu"
+
+msgid "Lua extension file"
+msgstr "Soubor s příponou Lua"
+
+msgid "Systray"
+msgstr "Oznamovací oblast panelu"
+
+msgid "Start minimized"
+msgstr "Spustit zmenšeno v panelu"
+
+msgid "Play/Stop song"
+msgstr "Přehrát/Zastavit píseň"
+
+msgid "Play/Pause song"
+msgstr "Přehrát/Pozastavit píseň"
+
+msgid "Mouse wheel"
+msgstr "Kolečko myši"
+
+msgid "Vertical mouse wheel:"
+msgstr "Svislé kolečko myši:"
+
+msgid "Horizontal mouse wheel:"
+msgstr "Vodorovné kolečko myši:"
+
+msgid "Mouse buttons"
+msgstr "Tlačítka myši"
+
+msgid "Miscellaneous"
+msgstr "Různé"
+
+msgid "Implicit command line"
+msgstr "Obsažený příkazový řádek"
+
+msgid "Cover art"
+msgstr "Obal"
+
+msgid "Default cover width:"
+msgstr "Výchozí šířka obalu:"
+
+msgid "50 pixels"
+msgstr "50 pixelů"
+
+msgid "100 pixels"
+msgstr "100 pixelů"
+
+msgid "200 pixels"
+msgstr "200 pixelů"
+
+msgid "300 pixels"
+msgstr "300 pixelů"
+
+msgid "use browser window width"
+msgstr "Použít šířku okna prohlížeče"
+
+msgid "Do not magnify images with smaller width"
+msgstr "Nezvětšovat obrázky s menší šířkou"
+
+msgid "Show cover thumbnail for Music Store tracks only"
+msgstr "Ukázat náhled obalu pouze pro skladby hudebního obchodu"
+
+msgid "Don't show cover thumbnail in the main window"
+msgstr "Neukazovat náhled obalu v hlavním okně"
+
+msgid "Use cover from external graphics file first"
+msgstr "Použít nejprve obal z vnějšího obrázkového souboru"
+
+msgid "Enable tooltips"
+msgstr "Povolit nástrojové rady"
+
+msgid "Simple view in LADSPA patch builder"
+msgstr "Jednoduchý pohled ve staviteli záplaty LADSPA"
+
+msgid "United windows minimization"
+msgstr "Jednotné zmenšení oken"
+
+msgid "Show hidden files and directories in file choosers"
+msgstr "Ukazovat ve voličích souborů skryté soubory a adresáře"
+
+msgid "Show tags tab first in the file info dialog"
+msgstr "Ukázat v dialogu s informacemi o souboru nejprve kartu se značkami"
+
+msgid "Playlist"
+msgstr "Seznam skladeb"
+
+msgid "Put control buttons at the bottom of playlist"
+msgstr ""
+
+msgid "Save and restore the playlist on exit/startup"
+msgstr "Uložit a obnovit seznam skladeb při ukončení/při spuštění"
+
+msgid "Save playlist periodically [min]:"
+msgstr "Ukládat pravidelně seznam skladeb [min]:"
+
+msgid "Album mode is the default when adding entire records"
+msgstr ""
+
+msgid "Always show the tab bar"
+msgstr "Vždy ukazovat pruh s kartami"
+
+msgid "Show close button in tab"
+msgstr "Ukázat tlačítko pro zavírání v kartě"
+
+msgid "When shuffling, records added in Album mode are played in order"
+msgstr ""
+
+msgid "Enable statusbar"
+msgstr "Povolit stavový řádek"
+
+msgid "Enable statusbar in playlist"
+msgstr "Povolit v seznamu skladeb stavový řádek"
+
+msgid "Show soundfile size in statusbar"
+msgstr "Ukázat ve stavovém řádku velikost zvukového souboru"
+
+msgid "Show RVA values"
+msgstr "Ukázat hodnoty RVA"
+
+msgid "Show track lengths"
+msgstr "Ukázat délky skladeb"
+
+msgid "Show active track name in bold"
+msgstr "Ukázat název činné skladby tučně"
+
+msgid "Automatically roll to active track"
+msgstr "Automaticky posunout na činnou skladbu"
+
+msgid "Enable rules hint"
+msgstr "Povolit radu s pravidly"
+
+msgid "Playlist column order"
+msgstr "Pořadí sloupců v seznamu skladeb"
+
+msgid ""
+"Drag and drop entries in the list below \n"
+"to set the column order in the Playlist."
+msgstr ""
+"Táhněte a pusťte záznamy do seznamu níže\n"
+"pro nastavení pořadí sloupců v seznamu skladeb."
+
+msgid "Column"
+msgstr "Sloup"
+
+msgid "Track titles"
+msgstr "Názvy skladeb"
+
+msgid "RVA values"
+msgstr "Hodnoty RVA"
+
+msgid "Track lengths"
+msgstr "Délky skladeb"
+
+msgid "Hide comment pane"
+msgstr "Skrýt okno s poznámkou"
+
+msgid "Hide the Music Store comment pane"
+msgstr "Skrýt v hudebním obchodu okno s poznámkou"
+
+msgid "Enable toolbar"
+msgstr "Povolit nástrojový pruh"
+
+msgid "Enable toolbar in Music Store"
+msgstr "Povolit v hudebním obchodu nástrojový pruh"
+
+msgid "Enable statusbar in Music Store"
+msgstr "Povolit v hudebním obchodu stavový řádek"
+
+msgid "Expand Stores on startup"
+msgstr "Rozbalit obchody při spuštění"
+
+msgid "Enable tree node icons"
+msgstr "Povolit ikony uzlů ve stromu"
+
+msgid "Enable Music Store tree node icons"
+msgstr "Povolit ikony uzlů ve stromu hudebního obchodu"
+
+msgid "Ask for confirmation when removing items"
+msgstr "Dotazovat se na potvrzení při odstraňování položek"
+
+msgid "Paths to Music Store databases"
+msgstr "Cesty do databází hudebního obchodu"
+
+msgid "Path"
+msgstr "Cesta"
+
+msgid "Access"
+msgstr "Přístup"
+
+msgid "Refresh"
+msgstr "Obnovit"
+
+msgid "DSP"
+msgstr "Digitální zpracování signálu (DSP)"
+
+msgid "LADSPA plugin processing"
+msgstr "Zpracování přídavného modulu LADSPA"
+
+msgid "Pre Fader (before Volume & Balance)"
+msgstr "Před-prolínač (před &vyvážením hlasitosti)"
+
+msgid "Post Fader (after Volume & Balance)"
+msgstr "Po-prolínač (&po vyvážení hlasitosti)"
+
+msgid ""
+"Aqualung is compiled without LADSPA plugin support.\n"
+"See the About box and the documentation for details."
+msgstr ""
+"Aqualung je sestaven bez podpory pro přídavný modul LADSPA.\n"
+"Podívejte se do okna O programu a do dokumentace na podrobnosti."
+
+msgid "Sample Rate Converter type"
+msgstr "Typ převodníku vzorkovacího kmitočtu"
+
+msgid ""
+"Aqualung is compiled without Sample Rate Converter support.\n"
+"See the About box and the documentation for details."
+msgstr ""
+"Aqualung je sestaven bez podpory pro převodník vzorkovacího kmitočtu.\n"
+"Podívejte se do okna O programu a do dokumentace na podrobnosti."
+
+msgid "Playback RVA"
+msgstr "Přehrávání RVA"
+
+msgid "Enable playback RVA"
+msgstr "Povolit přehrávání RVA"
+
+msgid "Listening environment:"
+msgstr "Poslechové prostředí:"
+
+msgid "Audiophile"
+msgstr "Milovník kvalitní reprodukce"
+
+msgid "Living room"
+msgstr "Obývací pokoj"
+
+msgid "Office"
+msgstr "Kancelář"
+
+msgid "Noisy workshop"
+msgstr "Hlučná dílna"
+
+msgid "Reference volume [dBFS] :"
+msgstr "Srovnávací hlasitost [dBFS]:"
+
+msgid "Steepness [dB/dB] :"
+msgstr "Strmost [dB/dB]:"
+
+msgid "RVA for Unmeasured Files [dB] :"
+msgstr "RVA pro nezměřené soubory[dB]:"
+
+msgid "Apply averaged RVA to tracks of the same record"
+msgstr ""
+
+msgid "Drop statistical aberrations based on"
+msgstr ""
+
+#, no-c-format
+msgid "% of standard deviation"
+msgstr ""
+
+msgid "Linear threshold [dB]"
+msgstr ""
+
+msgid "Linear threshold [dB] :"
+msgstr ""
+
+#, no-c-format
+msgid "% of standard deviation :"
+msgstr ""
+
+msgid "ReplayGain tag to use (with fallback to the other): "
+msgstr ""
+
+msgid "Replaygain_track_gain"
+msgstr "Zesílení skladby při vyrovnání hlasitosti"
+
+msgid "Replaygain_album_gain"
+msgstr "Zesílení alba při vyrovnání hlasitosti"
+
+msgid "Adding files to Playlist"
+msgstr ""
+
+msgid ""
+"Use basename only instead of full path\n"
+"if no metadata is available."
+msgstr ""
+
+msgid "Metadata editor (File info dialog)"
+msgstr "Editor popisných dat (dialog s informacemi o souboru)"
+
+msgid ""
+"When adding new frames, try to set their contents\n"
+"from another tag's equivalent frame."
+msgstr ""
+
+msgid "MPEG audio ID3v1/ID3v2 character encoding"
+msgstr ""
+
+msgid "Batch update & encode (mass tagger, CD ripper, file export)"
+msgstr ""
+
+msgid "Tags to add when creating or updating MPEG audio files:"
+msgstr ""
+
+msgid ""
+"Note: pre-existing tags will be updated even though they\n"
+"might not be checked here."
+msgstr ""
+
+msgid "CD Audio"
+msgstr "Zvukové CD"
+
+msgid "CD drive speed:"
+msgstr "Rychlost mechaniky CD:"
+
+msgid "\tMaximum number of retries:"
+msgstr "\tNejvětší počet nových pokusů:"
+
+msgid "Force TOC re-read on every drive scan"
+msgstr ""
+"Vynutit opětovné přečtení tabulky s obsahem (TOC) při každém prohledávání "
+"mechaniky"
+
+msgid "Automatically add CDs to Playlist"
+msgstr "Automaticky přidat CD do seznamu skladeb"
+
+msgid "Automatically remove CDs from Playlist"
+msgstr "Automaticky odstranit CD ze seznamu skladeb"
+
+msgid "CDDB server:"
+msgstr "Server CDDB:"
+
+msgid "Connection timeout [sec]:"
+msgstr "Překročení času připojení [s]:"
+
+msgid "Email address for submission:"
+msgstr "E-mailová adresa pro odesílání:"
+
+msgid "Local CDDB directory:"
+msgstr "Místní adresář CDDB:"
+
+msgid "Use the local database only"
+msgstr "Použít pouze místní databázi"
+
+msgid "Protocol for querying (direct connection only):"
+msgstr "Protokol pro dotazování (pouze přímé připojení):"
+
+msgid "CDDBP (port 888)"
+msgstr "CDDBP (přípojka 888)"
+
+msgid "HTTP (port 80)"
+msgstr "HTTP (přípojka 80)"
+
+msgid "Internet"
+msgstr "Internet"
+
+msgid "Direct connection to the Internet"
+msgstr "Přímé připojení k internetu"
+
+msgid "Connect via HTTP proxy"
+msgstr "Připojit se přes proxy HTTP"
+
+msgid "Proxy settings"
+msgstr "Nastavení proxy"
+
+msgid "Proxy host:"
+msgstr "Server proxy:"
+
+msgid "Port:"
+msgstr "Přípojka:"
+
+msgid "No proxy for:"
+msgstr "Žádná proxy pro:"
+
+msgid "Timeout for socket I/O:"
+msgstr "Překročení času pro socket I/O:"
+
+msgid "seconds"
+msgstr "sekund"
+
+msgid "Appearance"
+msgstr "Vzhled"
+
+msgid "Override skin settings"
+msgstr "Přepsat nastavení vzhledu"
+
+msgid "Fonts"
+msgstr "Písma"
+
+msgid "Playlist: "
+msgstr "Seznam skladeb:"
+
+msgid "Music Store: "
+msgstr "Hudební obchod: "
+
+msgid "Big timer: "
+msgstr "Velké hodiny: "
+
+msgid "Small timers: "
+msgstr "Malé hodiny: "
+
+msgid "Song title: "
+msgstr "Název písně: "
+
+msgid "Song info: "
+msgstr "Informace o písni: "
+
+msgid "Statusbar: "
+msgstr "Stavový řádek: "
+
+msgid "Colors"
+msgstr "Barvy"
+
+msgid "Song in playlist: "
+msgstr "Píseň v seznamu skladeb: "
+
+msgid "Active song in playlist: "
+msgstr "Činná píseň v seznamu skladeb: "
+
+msgid "(Untitled)"
+msgstr "(Bez názvu)"
+
+#, c-format
+msgid " (%d/%d)"
+msgstr " (%d/%d)"
+
+msgid "Select files"
+msgstr "Vybrat soubory"
+
+msgid "Select directory"
+msgstr "Vybrat adresář"
+
+msgid "Add URL"
+msgstr "Přidat adresu (URL)"
+
+msgid "URL:"
+msgstr "Adresa (URL):"
+
+msgid "Please specify the file to save the playlist to."
+msgstr "Zadejte, prosím, soubor, do něhož se má uložit seznam skladeb."
+
+msgid "Please specify the file to load the playlist from."
+msgstr "Zadejte, prosím, soubor, ze kterého se má nahrát seznam skladeb."
+
+msgid ""
+"Playback RVA is currently disabled.\n"
+"Do you want to enable it now?"
+msgstr ""
+"Přehrávání RVA je nyní zakázáno.\n"
+"Chcete je povolit nyní?"
+
+msgid "counting..."
+msgstr "Počítá se..."
+
+msgid "track"
+msgstr "Skladba"
+
+msgid "tracks"
+msgstr "Skladby"
+
+msgid "Rename playlist"
+msgstr "Přejmenovat seznam skladeb"
+
+msgid "Name:"
+msgstr "Název:"
+
+msgid "New tab"
+msgstr "Nová karta"
+
+msgid "Close tab"
+msgstr "Zavřít kartu"
+
+msgid "Undo close tab"
+msgstr "Zpět zavření karty"
+
+msgid "Close other tabs"
+msgstr "Zavřít ostatní karty"
+
+msgid " Selected: "
+msgstr " Vybráno: "
+
+msgid "Total: "
+msgstr "Celkem: "
+
+msgid "Add files"
+msgstr "Přidat soubory"
+
+msgid ""
+"Add files to playlist\n"
+"(Press right mouse button for menu)"
+msgstr ""
+"Přidat soubory do seznamu skladeb.\n"
+"(Stiskněte pravé tlačítko myši pro vyvolání nabídky)"
+
+msgid "Select all"
+msgstr "Vybrat vše"
+
+msgid ""
+"Select all songs in playlist\n"
+"(Press right mouse button for menu)"
+msgstr ""
+"Vybrat všechny písně v seznamu skladeb.\n"
+"(Stiskněte pravé tlačítko myši pro vyvolání nabídky)"
+
+msgid "Remove selected"
+msgstr "Odstranit vybrané"
+
+msgid ""
+"Remove selected songs from playlist\n"
+"(Press right mouse button for menu)"
+msgstr ""
+"Odstranit vybrané písně v seznamu skladeb.\n"
+"(Stiskněte pravé tlačítko myši pro vyvolání nabídky)"
+
+msgid "Add directory"
+msgstr "Přidat adresář"
+
+msgid "Select none"
+msgstr "Zrušit výběr"
+
+msgid "Invert selection"
+msgstr "Obrátit výběr"
+
+msgid "Remove all"
+msgstr "Odstranit vše"
+
+msgid "Remove dead"
+msgstr "Odstranit zaniklé"
+
+msgid "Cut selected"
+msgstr "Vyjmout vybrané"
+
+msgid "Save playlist"
+msgstr "Uložit seznam skladeb"
+
+msgid "Save all playlists"
+msgstr "Uložit všechny seznamy skladeb"
+
+msgid "Load playlist in new tab"
+msgstr "Nahrát seznam skladeb do nové karty"
+
+msgid "Load playlist"
+msgstr "Nahrát seznam skladeb"
+
+msgid "Enqueue playlist"
+msgstr "Zařadit seznam skladeb"
+
+msgid "Send to iFP device"
+msgstr "Odeslat do zařízení iFP"
+
+msgid "Calculate RVA"
+msgstr "Spočítat RVA"
+
+msgid "Separate"
+msgstr "Rozdělit"
+
+msgid "Average"
+msgstr "Průměrný"
+
+msgid "Reread file metadata"
+msgstr "Přečíst popisná data znovu"
+
+msgid "File info..."
+msgstr "Informace o souboru..."
+
+msgid "Roll to active song"
+msgstr "Skutálet se k činné písni"
+
+msgid "Stop adding files"
+msgstr "Zastavit přidávání souborů"
+
+msgid "Files selected for removal"
+msgstr "Soubory vybrány pro odstranění"
+
+msgid "Remove files"
+msgstr "Odstranit soubory"
+
+msgid ""
+"The selected files will be deleted from the filesystem. No recovery will be "
+"possible after this operation.\n"
+"\n"
+"Do you want to proceed?"
+msgstr ""
+"Vybrané soubory budou smazány ze souborového systému. Po "
+"provedení této operace nebude možná žádná obnova.\n"
+"\n"
+"Chcete pokračovat?"
+
+#, c-format
+msgid "Unable to remove %d file."
+msgstr "Nelze odstranit %d soubor."
+
+#, c-format
+msgid "Unable to remove %d files."
+msgstr "Nelze odstranit %d souborů."
+
+msgid "LADSPA patch builder"
+msgstr "Stavitel záplaty LADSPA"
+
+msgid "Available plugins"
+msgstr "Dostupné přídavné moduly"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Category"
+msgstr "Skupina"
+
+msgid "Inputs"
+msgstr "Vstupy"
+
+msgid "Outputs"
+msgstr "Výstupy"
+
+msgid "Running plugins"
+msgstr "Běžící přídavné moduly"
+
+msgid "_Configure"
+msgstr "_Nastavit"
+
+msgid "Enable all plugins"
+msgstr "Povolit všechny přídavné moduly"
+
+msgid "Disable all plugins"
+msgstr "Zakázat všechny přídavné moduly"
+
+msgid "Invert current state"
+msgstr "Obrátit nynější stav"
+
+msgid "Clear list"
+msgstr "Vyprázdnit seznam"
+
+msgid "Untitled"
+msgstr "Bez názvu"
+
+msgid "JACK Port Setup"
+msgstr "Nastavení přípojky JACK"
+
+msgid "Rescan"
+msgstr "Prohledat znovu"
+
+msgid "Available connections"
+msgstr "Dostupná spojení"
+
+msgid "Clear connections"
+msgstr "Smazat spojení"
+
+msgid " out L"
+msgstr " výstup L"
+
+msgid " out R"
+msgstr " výstup P"
+
+msgid "Search the Music Store"
+msgstr "Hledat v hudebním obchodu"
+
+msgid "Key: "
+msgstr "Klíč: "
+
+msgid "Case sensitive"
+msgstr "Rozlišovat velikost písmen"
+
+msgid "Exact matches only"
+msgstr "Pouze přesné shody"
+
+msgid "Select first and close window"
+msgstr "Vybrat první a zavřít okno"
+
+msgid "Search in:"
+msgstr "Hledat v:"
+
+msgid "Artist names"
+msgstr "Jména umělců"
+
+msgid "Record titles"
+msgstr "Názvy nahrávek"
+
+msgid "Comments"
+msgstr "Poznámky"
+
+msgid "Search"
+msgstr "Hledat"
+
+msgid "Search the Playlist"
+msgstr "Prohledat seznam skladeb"
+
+msgid "Available skins"
+msgstr "Dostupné vzhledy"
+
+msgid "Drive info"
+msgstr "Informace o mechanice"
+
+msgid "Device path:"
+msgstr "Cesta k zařízení:"
+
+msgid "Vendor:"
+msgstr "Prodejce:"
+
+msgid "Revision:"
+msgstr "Změna:"
+
+msgid ""
+"The information below is reported by the drive, and\n"
+"may not reflect the actual capabilities of the device."
+msgstr ""
+
+msgid "Eject"
+msgstr "Vysunout"
+
+msgid "Close tray"
+msgstr "Zavřít panel"
+
+msgid "Disable manual eject"
+msgstr "Zakázat ruční vysunutí"
+
+msgid "Select juke-box disc"
+msgstr "Vybrat disk s hrací hudební skříní"
+
+msgid "Set drive speed"
+msgstr "Nastavit rychlost mechaniky"
+
+msgid "Detect media change"
+msgstr "Zjistit změnu nosiče"
+
+msgid "Read multiple sessions"
+msgstr "Číst hromadná sezení"
+
+msgid "Hard reset device"
+msgstr "Tvrdé opětovné spuštění zařízení"
+
+msgid "Reading"
+msgstr "Čtení"
+
+msgid "Play CD Audio"
+msgstr "Přehrát CD audio"
+
+msgid "Read CD-DA"
+msgstr "Číst CD-DA"
+
+msgid "Read CD+G"
+msgstr "Číst CD+G"
+
+msgid "Read CD-R"
+msgstr "Číst CD-R"
+
+msgid "Read CD-RW"
+msgstr "Číst CD-RW"
+
+msgid "Read DVD-R"
+msgstr "Číst DVD-R"
+
+msgid "Read DVD+R"
+msgstr "Číst DVD+R"
+
+msgid "Read DVD-RW"
+msgstr "Číst DVD-RW"
+
+msgid "Read DVD+RW"
+msgstr "Číst DVD+RW"
+
+msgid "Read DVD-RAM"
+msgstr "Číst DVD-RAM"
+
+msgid "Read DVD-ROM"
+msgstr "Číst DVD-ROM"
+
+msgid "C2 Error Correction"
+msgstr "Oprava chyby C2"
+
+msgid "Read Mode 2 Form 1"
+msgstr "Režim čtení 2 Forma 1"
+
+msgid "Read Mode 2 Form 2"
+msgstr "Režim čtení 2 Forma 2"
+
+msgid "Read MCN"
+msgstr "Číst MCN"
+
+msgid "Read ISRC"
+msgstr "Číst ISRC"
+
+msgid "Writing"
+msgstr "Zapisuje se"
+
+msgid "Write CD-R"
+msgstr "Zapsat CD-R"
+
+msgid "Write CD-RW"
+msgstr "Zapsat CD-RW"
+
+msgid "Write DVD-R"
+msgstr "Zapsat DVD-R"
+
+msgid "Write DVD+R"
+msgstr "Zapsat DVD+R"
+
+msgid "Write DVD-RW"
+msgstr "Zapsat DVD-RW"
+
+msgid "Write DVD+RW"
+msgstr "Zapsat DVD+RW"
+
+msgid "Write DVD-RAM"
+msgstr "Zapsat DVD-RAM"
+
+msgid "Mount Rainier"
+msgstr "Mount Rainier"
+
+msgid "Burn Proof"
+msgstr "Zkouška vypálení"
+
+msgid "Disc info"
+msgstr "Informace o disku"
+
+msgid "This CD does not contain CD-Text information."
+msgstr "Toto CD neobsahuje informace o textu na CD."
+
+msgid "drive"
+msgstr "Mechanika"
+
+msgid "drives"
+msgstr "Mechaniky"
+
+msgid "record"
+msgstr "Nahrávka"
+
+msgid "records"
+msgstr "Nahrávky"
+
+msgid "Add to playlist"
+msgstr "Přidat do seznamu skladeb"
+
+msgid "Add to playlist (Album mode)"
+msgstr "Přidat do seznamu skladeb (režim alba)"
+
+msgid "CDDB query for this CD..."
+msgstr "Dotaz v CDDB pro toto CD..."
+
+msgid "Submit CD to CDDB database..."
+msgstr "Odeslat CD do databáze CDDB..."
+
+msgid "Rip CD..."
+msgstr "Vytáhnout skladby z CD"
+
+msgid "Disc info..."
+msgstr "Informace o disku..."
+
+msgid "Drive info..."
+msgstr "Informace o mechanice..."
+
+msgid "Comments:"
+msgstr "Poznámky:"
+
+msgid "Please select the xml file for this store."
+msgstr "Vyberte, prosím, soubor XML pro tento obchod."
+
+msgid "Create empty store"
+msgstr "Vytvořit prázdný obchod"
+
+msgid "Visible name:"
+msgstr "Viditelný název:"
+
+msgid "Edit Store"
+msgstr "Upravit obchod"
+
+msgid "Use relative paths in store file"
+msgstr "Použít relativních cest v souboru s obchodem"
+
+msgid "Add Artist"
+msgstr "Přidat umělce"
+
+msgid "Name to sort by:"
+msgstr "Řadit dle jména:"
+
+msgid "Edit Artist"
+msgstr "Upravit umělce"
+
+msgid "Please select the audio files for this record."
+msgstr "Vyberte, prosím, zvukové soubory pro tuto nahrávku."
+
+msgid "Add Record"
+msgstr "Přidat nahrávku"
+
+msgid "Auto-create tracks from these files:"
+msgstr "Automaticky vytvořit skladby z těchto souborů:"
+
+msgid "_Add files..."
+msgstr "_Přidat soubory…"
+
+msgid "Edit Record"
+msgstr "Upravit nahrávku"
+
+msgid "Please select the audio file for this track."
+msgstr "Vyberte, prosím, zvukový soubor pro tuto skladbu."
+
+msgid "Add Track"
+msgstr "Přidat skladbu"
+
+msgid "Edit Track"
+msgstr "Upravit skladbu"
+
+msgid "Duration:"
+msgstr "Doba trvání:"
+
+#, c-format
+msgid "Unmeasured"
+msgstr "Nezměřeno"
+
+msgid "Volume level:"
+msgstr "Úroveň hlasitosti"
+
+msgid "Use manual RVA value [dB]"
+msgstr "Použít ruční hodnotu RVA [dB]"
+
+#, c-format
+msgid "Really remove \"%s\" from the Music Store?"
+msgstr "Opravdu odstranit \"%s\" z hudebního obchodu?"
+
+msgid "Stop adding songs"
+msgstr "Zastavit přidávání písní"
+
+#, c-format
+msgid ""
+"The store '%s' already exists.\n"
+"Add it on the Settings/Music Store tab."
+msgstr ""
+"Obchod '%s' již existuje.\n"
+"Přidejte jej na kartě Nastavení/Hudební obchod."
+
+#, c-format
+msgid "Really remove store \"%s\" from the Music Store?"
+msgstr "Opravdu odstranit obchod \"%s\" z hudebního obchodu?"
+
+msgid "Remove Store"
+msgstr "Odstranit obchod"
+
+msgid "Do you want to save the store before removing?"
+msgstr "Chcete před odstraněním obchod uložit?"
+
+msgid "Remove Artist"
+msgstr "Odstranit umělce"
+
+msgid "Remove Record"
+msgstr "Odstranit nahrávku"
+
+#, fuzzy
+msgid "Remove Track"
+msgstr "Odstranit stopu"
+
+msgid "Update file metadata"
+msgstr "Aktualizovat popisná data k souboru"
+
+msgid "Track name"
+msgstr "Název skladby"
+
+msgid "Track comment"
+msgstr "Poznámka ke skladbě"
+
+msgid "Track number"
+msgstr "Číslo skladby"
+
+msgid "Failed to set metadata for the following files:"
+msgstr "Nepodařilo se nastavit popisná data k následujícím souborům:"
+
+msgid "Filename"
+msgstr "Název souboru"
+
+msgid "Reason"
+msgstr "Důvod"
+
+msgid "(no comment)"
+msgstr "(žádná poznámka)"
+
+msgid "artist"
+msgstr "umělec"
+
+msgid "artists"
+msgstr "umělců"
+
+#, c-format
+msgid ""
+"File \"%s\" does not exist or your write permission has been withdrawn. "
+"Check if the partition containing the store file has been unmounted."
+msgstr ""
+
+msgid "Build / Update store from filesystem..."
+msgstr "Postavit/Obnovit obchod ze souborového systému..."
+
+msgid "Edit store..."
+msgstr "Upravit obchod..."
+
+msgid "Export store..."
+msgstr "Vyvést obchod..."
+
+msgid "Save store"
+msgstr "Uložit obchod"
+
+msgid "Remove store"
+msgstr "Odstranit obchod"
+
+msgid "Add new artist to this store..."
+msgstr "Přidat nového umělce do tohoto obchodu..."
+
+msgid "Calculate volume (recursive)"
+msgstr "Spočítat hlasitost (včetně podsložek)"
+
+msgid "Unmeasured tracks only"
+msgstr "Pouze nezměřené skladby"
+
+msgid "All tracks"
+msgstr "Všechny skladby"
+
+msgid "Batch-update file metadata..."
+msgstr "Aktualizovat popisná data k souboru dávkově ..."
+
+msgid "Add new artist..."
+msgstr "Přidat nového umělce..."
+
+msgid "Edit artist..."
+msgstr "Upravit umělce..."
+
+msgid "Export artist..."
+msgstr "Vyvést umělce..."
+
+msgid "Remove artist"
+msgstr "Odstranit umělce"
+
+msgid "Add new record to this artist..."
+msgstr "Přidat novou nahrávku k tomuto umělci..."
+
+msgid "Add new record..."
+msgstr "Přidat novou nahrávku..."
+
+msgid "Edit record..."
+msgstr "Upravit nahrávku..."
+
+msgid "Export record..."
+msgstr "Vyvést nahrávku..."
+
+msgid "Remove record"
+msgstr "Odstranit nahrávku"
+
+msgid "Add new track to this record..."
+msgstr "Přidat novou skladbu do této nahrávky..."
+
+msgid "CDDB query for this record..."
+msgstr "Dotaz v CDDB pro tuto nahrávku..."
+
+msgid "Submit record to CDDB database..."
+msgstr "Odeslat nahrávku do databáze CDDB..."
+
+msgid "Add new track..."
+msgstr "Přidat novou skladbu..."
+
+msgid "Edit track..."
+msgstr "Upravit skladbu..."
+
+msgid "Export track..."
+msgstr "Vyvést skladbu..."
+
+msgid "Remove track"
+msgstr "Odstranit skladbu"
+
+msgid "Calculate volume"
+msgstr "Spočítat hlasitost"
+
+msgid "Only if unmeasured"
+msgstr "Pouze pokud nezměřeno"
+
+msgid "In any case"
+msgstr "V každém případě"
+
+msgid "Update file metadata..."
+msgstr "Aktualizovat popisná data k souboru..."
+
+msgid "Please select the download directory for this podcast."
+msgstr "Vyberte, prosím, adresář pro stahování tento zvukový záznam."
+
+msgid "Subscribe to new feed"
+msgstr "Přihlásit se k odběru nového kanálu"
+
+msgid "Edit feed settings"
+msgstr "Upravit nastavení kanálu"
+
+msgid "Podcast URL:"
+msgstr "Adresa zvukového záznamu (URL):"
+
+msgid "Download directory:"
+msgstr "Adresář pro stahování:"
+
+msgid "Auto-check interval [hour]:"
+msgstr "Interval automatického prověření [hodina]:"
+
+msgid ""
+"Automatic update has been disabled for all feeds\n"
+"in the Podcasts store popup menu."
+msgstr ""
+"Automatická aktualizace byla zakázána pro všechny kanály\n"
+"ve vyskakovací nabídce obchodu se zvukovými záznamy."
+
+msgid "Limits"
+msgstr "Omezení"
+
+msgid "Maximum number of items:"
+msgstr "Nejvyšší počet položek:"
+
+msgid "Remove older items [day]:"
+msgstr "Odstranit starší položky [den]:"
+
+msgid "Maximum space to use [MB]:"
+msgstr "Největší velikost místa k použití (MiB]:"
+
+msgid "Podcasts"
+msgstr "Zvukové záznamy"
+
+msgid "Updating..."
+msgstr "Obnovuje se..."
+
+msgid "Delete downloaded items from the filesystem"
+msgstr "Smazat stažené položky ze souborového systému"
+
+msgid "Remove feed"
+msgstr "Odstranit kanál"
+
+#, c-format
+msgid "Really remove '%s' from the Music Store?"...
[truncated message content] |
|
From: <tsz...@us...> - 2014-06-14 13:28:55
|
Revision: 1304
http://sourceforge.net/p/aqualung/code/1304
Author: tszilagyi
Date: 2014-06-14 13:28:51 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Regression fix:
Commit 1302 makes configuration fail with lua-5.1.5
http://aqualung.factorial.hu/mantis/bug_view_advanced_page.php?bug_id=0000190
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2014-06-09 12:54:54 UTC (rev 1303)
+++ trunk/configure.ac 2014-06-14 13:28:51 UTC (rev 1304)
@@ -414,7 +414,9 @@
[AQUALUNG_FOUND([lua])],
[PKG_CHECK_MODULES([lua], [lua >= 5.2],
[AQUALUNG_FOUND([lua])],
- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])
+ [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+ [AQUALUNG_FOUND([lua])],
+ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])])
# Compiler and linker variables.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-06-09 12:54:58
|
Revision: 1303
http://sourceforge.net/p/aqualung/code/1303
Author: tszilagyi
Date: 2014-06-09 12:54:54 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Make the APE decoder compile with current libmac-dev (4.11-u4-b5-s7-d)
Modified Paths:
--------------
trunk/src/decoder/dec_mac.cpp
Modified: trunk/src/decoder/dec_mac.cpp
===================================================================
--- trunk/src/decoder/dec_mac.cpp 2014-06-06 02:13:19 UTC (rev 1302)
+++ trunk/src/decoder/dec_mac.cpp 2014-06-09 12:54:54 UTC (rev 1303)
@@ -174,7 +174,7 @@
int ret = 0;
- wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+ wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
pdecompress = CreateIAPEDecompress(pUTF16, &ret);
free(pUTF16);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <qua...@us...> - 2014-06-06 02:13:30
|
Revision: 1302
http://sourceforge.net/p/aqualung/code/1302
Author: quasireality
Date: 2014-06-06 02:13:19 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Work with and prefer Lua 5.2, but remain compatible with 5.1
Additionally, recognize an additional style of Lua library naming,
which is used by OpenBSD.
Modified Paths:
--------------
trunk/configure.ac
trunk/src/ext_lua.c
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2014-06-03 14:20:30 UTC (rev 1301)
+++ trunk/configure.ac 2014-06-06 02:13:19 UTC (rev 1302)
@@ -400,13 +400,21 @@
])
AQUALUNG_DETECT([lua], [Lua Extension],
- [PKG_CHECK_MODULES([lua], [lua5.1],
+ [PKG_CHECK_MODULES([lua], [lua5.2],
[AQUALUNG_FOUND([lua])],
- [PKG_CHECK_MODULES([lua], [lua-5.1],
+ [PKG_CHECK_MODULES([lua], [lua-5.2],
[AQUALUNG_FOUND([lua])],
- [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+ [PKG_CHECK_MODULES([lua], [lua52],
[AQUALUNG_FOUND([lua])],
- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])
+ [PKG_CHECK_MODULES([lua], [lua5.1],
+ [AQUALUNG_FOUND([lua])],
+ [PKG_CHECK_MODULES([lua], [lua-5.1],
+ [AQUALUNG_FOUND([lua])],
+ [PKG_CHECK_MODULES([lua], [lua51],
+ [AQUALUNG_FOUND([lua])],
+ [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+ [AQUALUNG_FOUND([lua])],
+ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])
# Compiler and linker variables.
Modified: trunk/src/ext_lua.c
===================================================================
--- trunk/src/ext_lua.c 2014-06-03 14:20:30 UTC (rev 1301)
+++ trunk/src/ext_lua.c 2014-06-06 02:13:19 UTC (rev 1302)
@@ -550,7 +550,7 @@
L = NULL;
}
- L = lua_open();
+ L = luaL_newstate();
luaL_openlibs(L);
error = luaL_dostring(L, AQUALUNG_LUA_API);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-06-03 14:20:37
|
Revision: 1301
http://sourceforge.net/p/aqualung/code/1301
Author: tszilagyi
Date: 2014-06-03 14:20:30 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
Tag R-1300 as 1.0-rc1
Added Paths:
-----------
tags/1.0-rc1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-06-03 14:08:19
|
Revision: 1300
http://sourceforge.net/p/aqualung/code/1300
Author: tszilagyi
Date: 2014-06-03 14:08:16 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
Remove redundant code from create_gui()
Modified Paths:
--------------
trunk/src/core.c
trunk/src/gui_main.c
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-06-03 13:46:03 UTC (rev 1299)
+++ trunk/src/core.c 2014-06-03 14:08:16 UTC (rev 1300)
@@ -1875,9 +1875,8 @@
char config_file[MAXLEN];
char default_param[MAXLEN];
char cl[MAXLEN];
- int ret;
- if ((ret = chdir(options.confdir)) != 0) {
+ if (chdir(options.confdir) != 0) {
if (errno == ENOENT) {
fprintf(stderr, "Creating directory %s\n", options.confdir);
if (mkdir(options.confdir, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
Modified: trunk/src/gui_main.c
===================================================================
--- trunk/src/gui_main.c 2014-06-03 13:46:03 UTC (rev 1299)
+++ trunk/src/gui_main.c 2014-06-03 14:08:16 UTC (rev 1300)
@@ -3560,17 +3560,6 @@
lrdf_init();
#endif /* HAVE_LADSPA */
- if (chdir(options.confdir) != 0) {
- if (errno == ENOENT) {
- fprintf(stderr, "Creating directory %s\n", options.confdir);
- mkdir(options.confdir, S_IRUSR | S_IWUSR | S_IXUSR);
- chdir(options.confdir);
- } else {
- fprintf(stderr, "An error occured while attempting chdir(\"%s\"). errno = %d\n",
- options.confdir, errno);
- }
- }
-
load_config();
if (options.title_format[0] == '\0')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-06-03 13:46:07
|
Revision: 1299
http://sourceforge.net/p/aqualung/code/1299
Author: tszilagyi
Date: 2014-06-03 13:46:03 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
Get ready to release aqualung 1.0-rc1
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/src/about.c
trunk/src/core.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-05-19 12:53:11 UTC (rev 1298)
+++ trunk/ChangeLog 2014-06-03 13:46:03 UTC (rev 1299)
@@ -1,3 +1,74 @@
+2014-06-03 Tom Szilagyi <tszilagyi at users dot sourceforge dot net>
+
+ * Aqualung 1.0-rc1
+ http://aqualung.factorial.hu
+
+ * Add support for custom playlist menu commands (via Lua extension)
+
+ * Add ability to define custom remote commands in Lua
+
+ * Add support for custom keybindings in the main window
+
+ * Add a current_file() Lua extension method for the currently playing file
+
+ * Add support for hooks for executing extension code when certain events occur
+
+ * Add track_position_change hook
+
+ * Add option to use cover art from external graphics file instead of image
+ embedded in audio file
+
+ * Add export track template flag %x for including original audio filename
+ (without extension) in exported filename
+
+ * Dialog boxes made non-modal for improved user experience and workflow:
+ About, Export, File info, Search, Settings
+
+ * File info dialog now has buttons to jump to prev/next track without closing
+ dialog, makes editing multiple tracks' metadata much easier
+
+ * Allow the ladspa plugin code to work on OpenBSD
+
+ * Support multimedia keys
+
+ * Support custom character encodings in metadata
+
+ * Handle JACK disconnect more gracefully
+
+ * Automatic save/restore of JACK connections to/from config.xml
+
+ * Ogg stream metadata changes are really sent upstream. Track changes in Ogg
+ internet radios are picked up by the GUI
+
+ * Recognize audio/ogg as Ogg Vorbis streaming format
+
+ * Seeking via arrow keys is +- 5 seconds regardless of track length
+
+ * Resume alsa stream after suspend to ram
+
+ * Add -b (--buffer-size) option to set ALSA output buffer size
+
+ * Fix musepack replaygain values when using a recent libmpcdec
+
+ * Build with current versions of ffmpeg/libav*
+
+ * CDDA: add support for libcdio 0.90 API changes
+
+ * Require GTK+2 >= 2.18
+ The Linux distribution cutoff era becomes something like:
+ Debian 6.0 "squeeze" / Fedora 12 "constantine" / RHEL 6 / Ubuntu 9.10 "karmic"
+
+ * Big overhaul of configure system (still using autotools, but much improved)
+
+ * Fixes: memory leaks, regressions, crashes, etc.
+
+ * Code cleanup: includes, macros, library functions, threading, portability
+
+ * Documentation updates and fixes to the doc build system
+
+ * Translation additions/updates: Chinese (simplified), Dutch, French, Polish,
+ Russian, Spanish, Ukrainian
+
2010-01-31 Tom Szilagyi <tszilagyi at users dot sourceforge dot net>
* Aqualung 0.9beta11
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2014-05-19 12:53:11 UTC (rev 1298)
+++ trunk/Makefile.am 2014-06-03 13:46:03 UTC (rev 1299)
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = doc po skin . src
-EXTRA_DIST = autogen.sh gettext.h ladspa.h
+EXTRA_DIST = autogen.sh gettext.h ladspa.h src/version.h src/undef_ac_pkg.h
all-local:
cd src; \
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2014-05-19 12:53:11 UTC (rev 1298)
+++ trunk/src/about.c 2014-06-03 13:46:03 UTC (rev 1299)
@@ -357,7 +357,7 @@
gtk_text_buffer_insert_with_tags(buffer, &iter, _("Homepage:"), -1, tag, NULL);
gtk_text_buffer_insert_at_cursor(buffer, " http://aqualung.factorial.hu\n", -1);
- gtk_text_buffer_insert_at_cursor(buffer, "\nCopyright (C) 2004-2010 Tom Szilagyi\n\n\n", -1);
+ gtk_text_buffer_insert_at_cursor(buffer, "\nCopyright (C) 2004-2014 Tom Szilagyi\n\n\n", -1);
gtk_text_buffer_get_end_iter(buffer, &iter);
gtk_text_buffer_insert_with_tags(buffer, &iter, _("Authors:"), -1, tag, NULL);
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-05-19 12:53:11 UTC (rev 1298)
+++ trunk/src/core.c 2014-06-03 13:46:03 UTC (rev 1299)
@@ -1877,20 +1877,21 @@
char cl[MAXLEN];
int ret;
-
if ((ret = chdir(options.confdir)) != 0) {
if (errno == ENOENT) {
fprintf(stderr, "Creating directory %s\n", options.confdir);
if (mkdir(options.confdir, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
- fprintf(stderr, "fatal error: cannot create config directory.\n");
- fprintf(stderr, "mkdir: %s\n", strerror(errno));
+ perror("cannot create config directory: mkdir");
exit(1);
- } else {
- chdir(options.confdir);
}
+ if (chdir(options.confdir) != 0) {
+ perror("cannot cd to new config directory: chdir");
+ exit(1);
+ }
} else {
- fprintf(stderr, "An error occured while attempting chdir(\"%s\"). errno = %d\n",
- options.confdir, errno);
+ perror("cd to confdir: chdir");
+ fprintf(stderr, "options.confdir: %s\n", options.confdir);
+ exit(1);
}
}
@@ -1973,7 +1974,7 @@
fprintf(stderr, "Aqualung -- Music player for GNU/Linux\n");
fprintf(stderr, "Build version: %s\n", AQUALUNG_VERSION);
fprintf(stderr,
- "(C) 2004-2010 Tom Szilagyi <tsz...@us...>\n"
+ "(C) 2004-2014 Tom Szilagyi <tsz...@us...>\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; see the file COPYING for details.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-19 12:53:13
|
Revision: 1298
http://sourceforge.net/p/aqualung/code/1298
Author: tszilagyi
Date: 2014-05-19 12:53:11 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Fix crash on file info dialog opening non-wavpack file with wavpack decoder compiled in
Modified Paths:
--------------
trunk/src/file_info.c
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-07 09:18:58 UTC (rev 1297)
+++ trunk/src/file_info.c 2014-05-19 12:53:11 UTC (rev 1298)
@@ -1851,7 +1851,7 @@
gtk_entry_set_text(GTK_ENTRY(fi->entry_nsamples), str);
#ifdef HAVE_WAVPACK
- if (!fi->is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
+ if (!fi->is_cdda && fi->fdec && fi->fdec->file_lib == WAVPACK_LIB) {
wavpack_pdata_t * pd = (wavpack_pdata_t *)fi->dec->pdata;
int mode = WavpackGetMode(pd->wpc);
@@ -2071,7 +2071,7 @@
fi_add_file_table_row(_("Bandwidth:"), &fi->entry_bw, table_file, 4);
fi_add_file_table_row(_("Total samples:"), &fi->entry_nsamples, table_file, 5);
#ifdef HAVE_WAVPACK
- if (!fi->is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
+ if (!fi->is_cdda && fi->fdec && fi->fdec->file_lib == WAVPACK_LIB) {
fi_add_file_table_row(_("Mode:"), &fi->entry_mode, table_file, 6);
}
#endif /* HAVE_WAVPACK */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-07 09:19:01
|
Revision: 1297
http://sourceforge.net/p/aqualung/code/1297
Author: tszilagyi
Date: 2014-05-07 09:18:58 +0000 (Wed, 07 May 2014)
Log Message:
-----------
Fix compilation in the presence of the WavPack decoder library
Modified Paths:
--------------
trunk/src/file_info.c
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-05 17:49:38 UTC (rev 1296)
+++ trunk/src/file_info.c 2014-05-07 09:18:58 UTC (rev 1297)
@@ -1851,8 +1851,8 @@
gtk_entry_set_text(GTK_ENTRY(fi->entry_nsamples), str);
#ifdef HAVE_WAVPACK
- if (!is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
- wavpack_pdata_t * pd = (wavpack_pdata_t *)dec->pdata;
+ if (!fi->is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
+ wavpack_pdata_t * pd = (wavpack_pdata_t *)fi->dec->pdata;
int mode = WavpackGetMode(pd->wpc);
if ((mode & MODE_LOSSLESS) && (mode & MODE_WVC)) {
@@ -2071,7 +2071,7 @@
fi_add_file_table_row(_("Bandwidth:"), &fi->entry_bw, table_file, 4);
fi_add_file_table_row(_("Total samples:"), &fi->entry_nsamples, table_file, 5);
#ifdef HAVE_WAVPACK
- if (!is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
+ if (!fi->is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
fi_add_file_table_row(_("Mode:"), &fi->entry_mode, table_file, 6);
}
#endif /* HAVE_WAVPACK */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-05 17:49:46
|
Revision: 1296
http://sourceforge.net/p/aqualung/code/1296
Author: tszilagyi
Date: 2014-05-05 17:49:38 +0000 (Mon, 05 May 2014)
Log Message:
-----------
Fix: file info dialog across CDDA and disk tracks
Modified Paths:
--------------
trunk/src/file_info.c
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-04 22:07:31 UTC (rev 1295)
+++ trunk/src/file_info.c 2014-05-05 17:49:38 UTC (rev 1296)
@@ -1874,6 +1874,7 @@
gboolean
fi_media_init(fi_t * fi) {
+ fi->is_cdda = 0;
fi->bail_out = 0;
fi->trash = trashlist_new();
@@ -1946,7 +1947,7 @@
}
fi->n_pages = 1;
for (i = 1; i < FI_MAXPAGES; i++) {
- fi->pageidx[i].tag = FALSE; //XXX
+ fi->pageidx[i].tag = FALSE;
}
fi->media_ok = fi_media_init(fi);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-04 22:07:34
|
Revision: 1295
http://sourceforge.net/p/aqualung/code/1295
Author: tszilagyi
Date: 2014-05-04 22:07:31 +0000 (Sun, 04 May 2014)
Log Message:
-----------
Implement file info dialog's prev/next track feature.
The newly added buttons at the bottom right of the dialog now do their
thing: the whole dialog is refreshed with data from the previous/next
track (according to the natural ordering of the tree model from where
the dialog has been opened from).
Special care has been taken to implement the following corner cases:
- files not accessible anymore
- alternation of read-only/writable files
- files with or without cover images besides them
- files with or without embedded image metadata
- do not lose dirty (edited) metadata
- if possible, stay on the same tab for the new file
Quite an amount of refactoring was done along the way, hopefully for
the better.
This puts a glorious end to bug#158 [next file & prev file in File
Info gui]
Modified Paths:
--------------
trunk/src/file_info.c
trunk/src/metadata.c
trunk/src/metadata.h
trunk/src/store_file.c
trunk/src/utils_gui.c
trunk/src/utils_gui.h
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/file_info.c 2014-05-04 22:07:31 UTC (rev 1295)
@@ -66,6 +66,8 @@
/* requested width of value display/edit widgets */
#define VAL_WIDGET_WIDTH 250
+/* dimensions of cover thumbnail */
+#define THUMB_SIZE 48
/* import destination codes */
enum {
@@ -114,6 +116,7 @@
GtkWidget * entry_mode;
/* work data */
+ gboolean media_ok;
char * name;
char * filename;
decoder_t * dec;
@@ -128,6 +131,7 @@
GtkWidget * event_box;
GtkWidget * cover_align;
GtkWidget * hbox;
+ GtkWidget * add_tag_table;
GtkWidget * button_table;
GtkWidget * prev_button;
GtkWidget * next_button;
@@ -137,7 +141,9 @@
int addable_tags; /* META_TAG_*, bitwise or-ed */
gint n_pages; /* number of notebook pages */
pageidx_t pageidx[FI_MAXPAGES];
+ int selected_tag;
int dirty; /* whether the dialog has unsaved changes */
+ gboolean cover_set_from_apic;
/* for MOD info */
GtkWidget * smp_instr_list;
@@ -205,24 +211,45 @@
for (i = 0; i < FI_MAXPAGES; i++) {
fi->pageidx[i].tag = -1;
}
+ fi->selected_tag = -1;
return fi;
}
void
-fi_delete(fi_t * fi) {
+fi_unload(fi_t * fi) {
+ fi->media_ok = FALSE;
+ if (fi->save_button) {
+ if (GTK_IS_WIDGET(fi->save_button)) gtk_widget_destroy(fi->save_button);
+ fi->save_button = NULL;
+ }
+ if (fi->add_tag_table) {
+ if (GTK_IS_WIDGET(fi->add_tag_table)) gtk_widget_destroy(fi->add_tag_table);
+ fi->add_tag_table = NULL;
+ }
- int i;
-
- if (fi == NULL)
- return;
-
if (fi->fdec != NULL) {
file_decoder_delete(fi->fdec);
+ fi->fdec = NULL;
+ fi->meta = NULL;
}
free(fi->name);
free(fi->filename);
+ trashlist_free(fi->trash);
+ fi->trash = NULL;
+ fi->cover_set_from_apic = FALSE;
+}
+
+void
+fi_delete(fi_t * fi) {
+
+ int i;
+
+ if (fi == NULL) return;
+
+ fi_unload(fi);
+
for (i = 0; i < FI_MAXPAGES; i++) {
g_slist_free(fi->pageidx[i].slist);
fi->pageidx[i].slist = NULL;
@@ -296,8 +323,14 @@
if (fi->dirty != 0) {
switch (fi_close_dialog(fi)) {
case 1: /* Save and close */
- return fi_save(NULL, fi);
+ if (fi_save(NULL, fi)) {
+ fi_mark_unchanged(fi);
+ return TRUE;
+ } else {
+ return FALSE;
+ }
case 2: /* Discard changes */
+ fi_mark_unchanged(fi);
return TRUE;
default: /* Do not close */
return FALSE;
@@ -318,7 +351,6 @@
unregister_toplevel_window(fi->info_window);
gtk_widget_destroy(fi->info_window);
- trashlist_free(fi->trash);
fi_delete(fi);
return TRUE;
@@ -559,28 +591,34 @@
}
}
-
-void
-fi_set_page(fi_t * fi) {
-
- fi->n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(fi->nb));
- if (fi->n_pages > 1) {
- gtk_notebook_set_current_page(GTK_NOTEBOOK(fi->nb), options.tags_tab_first ? 1 : 0);
- }
-}
-
-
int
lookup_page(fi_t * fi, int tag) {
int i;
for (i = 0; i < FI_MAXPAGES; i++) {
- if (fi->pageidx[i].tag == tag)
+ if (fi->pageidx[i].tag == tag) {
return i;
+ }
}
return -1;
}
+void
+fi_set_page(fi_t * fi) {
+ if (fi->selected_tag > -1) { /* try to select first page with the same tag */
+ int idx = lookup_page(fi, fi->selected_tag);
+ if (idx > -1) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(fi->nb), idx);
+ return;
+ }
+ }
+ /* fallback to default behaviour */
+ fi->n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(fi->nb));
+ if (fi->n_pages > 1) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(fi->nb), options.tags_tab_first ? 1 : 0);
+ }
+}
+
int
fi_tabwidth(fi_t * fi, metadata_t * meta) {
@@ -1424,12 +1462,14 @@
if (frame->type == META_FIELD_APIC) {
/* only display first APIC found */
meta_frame_t * first_apic = metadata_get_frame_by_type(fi->meta, META_FIELD_APIC, NULL);
- if (frame == first_apic && (find_cover_filename(fi->filename) == NULL || !options.use_external_cover_first)) {
+ if (frame == first_apic &&
+ (find_cover_filename(fi->filename) == NULL || !options.use_external_cover_first)) {
display_cover_from_binary(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, frame->data, frame->length, FALSE, TRUE);
+ THUMB_SIZE, THUMB_SIZE, frame->data, frame->length, FALSE, TRUE);
+ fi->cover_set_from_apic = TRUE;
} else {
display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, fi->filename, FALSE, TRUE);
+ THUMB_SIZE, THUMB_SIZE, fi->filename, FALSE, TRUE);
}
}
@@ -1509,7 +1549,7 @@
}
/* Remove notebook page and update fi->pageidx */
- for (i = 0; i < FI_MAXPAGES; i++) {
+ for (i = FI_MAXPAGES-1; i >= 0; i--) {
if (fi->pageidx[i].tag == tag) {
int k;
for (k = i; k < FI_MAXPAGES-1; k++) {
@@ -1517,7 +1557,7 @@
}
fi->pageidx[FI_MAXPAGES-1].tag = -1;
gtk_notebook_remove_page(GTK_NOTEBOOK(fi->nb), i);
- --fi->n_pages;
+ fi->n_pages--;
break;
}
}
@@ -1565,8 +1605,7 @@
gtk_widget_set_size_request(scrwin, -1, 275);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrwin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrwin),
- GTK_SHADOW_NONE);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrwin), GTK_SHADOW_NONE);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrwin), vbox_padding);
gtk_notebook_append_page(GTK_NOTEBOOK(fi->nb), vbox, label);
@@ -1639,8 +1678,7 @@
}
if ((fi->nb == NULL) || !GTK_IS_NOTEBOOK(fi->nb)) {
- fi_procmeta_wait_data_t * fi_procmeta_wait_data =
- calloc(1, sizeof(fi_procmeta_wait_data_t));
+ fi_procmeta_wait_data_t * fi_procmeta_wait_data = calloc(1, sizeof(fi_procmeta_wait_data_t));
fi_procmeta_wait_data->meta = meta;
fi_procmeta_wait_data->data = data;
aqualung_timeout_add(100, fi_procmeta_wait, (gpointer)fi_procmeta_wait_data);
@@ -1652,12 +1690,13 @@
}
/* remove possible previous metadata pages from notebook */
- for (i = 0; i < FI_MAXPAGES; i++) {
+ for (i = FI_MAXPAGES-1; i > 0; i--) {
if (fi->pageidx[i].tag != -1) {
gtk_notebook_remove_page(GTK_NOTEBOOK(fi->nb), i);
fi->pageidx[i].tag = -1;
}
}
+ fi->n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(fi->nb));
if (fi->meta != NULL) {
metadata_free(fi->meta);
@@ -1666,11 +1705,6 @@
fi->addable_tags = meta->valid_tags;
frame = meta->root;
- while (frame != NULL) {
- fi_procframe(fi, frame);
- frame = frame->next;
- }
-
if (fi->meta->writable && (fi->save_button == NULL)) {
fi->save_button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
g_signal_connect(fi->save_button, "clicked",
@@ -1680,23 +1714,32 @@
gtk_widget_show_all(fi->info_window);
}
- if (fi->meta->writable && (fi->combo == NULL)) {
+ if (fi->meta->writable && (fi->add_tag_table == NULL)) {
+ GtkWidget * addbtn;
- GtkWidget * addbtn, * label;
+ fi->add_tag_table = gtk_table_new(1, 3, FALSE);
+ gtk_box_pack_start(GTK_BOX(fi->hbox), fi->add_tag_table, FALSE, TRUE, 2);
addbtn = fi_procframe_addtagbtn(fi);
- gtk_box_pack_start(GTK_BOX(fi->hbox), addbtn, FALSE, FALSE, 5);
+ gtk_table_attach(GTK_TABLE(fi->add_tag_table), addbtn,
+ 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
- label = gtk_label_new(_("tag:"));
- gtk_box_pack_start(GTK_BOX(fi->hbox), label, FALSE, FALSE, 5);
+ gtk_table_attach(GTK_TABLE(fi->add_tag_table), gtk_label_new(_("tag:")),
+ 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
fi->combo = gtk_combo_box_new_text();
fi_fill_tagcombo(GTK_COMBO_BOX(fi->combo), fi->addable_tags);
- gtk_box_pack_start(GTK_BOX(fi->hbox), fi->combo, FALSE, FALSE, 5);
+ gtk_table_attach(GTK_TABLE(fi->add_tag_table), fi->combo,
+ 2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
gtk_widget_show_all(fi->info_window);
}
+ while (frame != NULL) {
+ fi_procframe(fi, frame);
+ frame = frame->next;
+ }
+
fi_set_page(fi);
}
@@ -1718,127 +1761,6 @@
return TRUE;
}
-
-gboolean
-leaf_iter(GtkTreeModel * model, GtkTreeIter * iter, gboolean last, GtkTreeIter * out) {
- if (gtk_tree_model_iter_has_child(model, iter)) {
- GtkTreeIter child_iter;
- printf("down\n");
- gint nth = 0;
- if (last) {
- nth = gtk_tree_model_iter_n_children(model, iter) - 1;
- }
- if (!gtk_tree_model_iter_nth_child(model, &child_iter, iter, nth)) {
- printf("fail nth_child\n");
- return FALSE;
- } else {
- return leaf_iter(model, &child_iter, last, out);
- }
- } else {
- printf("ready\n");
- *out = *iter;
- return TRUE;
- }
-}
-
-gboolean
-next_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * next, int mindepth) {
- GtkTreeIter copy = *iter;
- if (gtk_tree_model_iter_next(model, ©)) {
- printf("next\n");
- *iter = copy;
- return leaf_iter(model, iter, FALSE, next);
- } else {
- GtkTreeIter parent_iter;
- printf("up\n");
- if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
- printf("fail\n");
- return FALSE;
- } else {
- GtkTreePath * path = gtk_tree_model_get_path(model, &parent_iter);
- if (gtk_tree_path_get_depth(path) <= mindepth) {
- gtk_tree_path_free(path);
- printf("limit by mindepth\n");
- return FALSE;
- }
- gtk_tree_path_free(path);
- return next_iter(model, &parent_iter, next, mindepth);
- }
- }
-}
-
-gboolean
-prev_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * prev, int mindepth) {
- GtkTreePath * path = gtk_tree_model_get_path(model, iter);
- if (gtk_tree_path_prev(path)) {
- printf("prev\n");
- if (!gtk_tree_model_get_iter(model, iter, path)) {
- printf("fail\n");
- gtk_tree_path_free(path);
- return FALSE;
- } else {
- gtk_tree_path_free(path);
- return leaf_iter(model, iter, TRUE, prev);
- }
- } else {
- GtkTreeIter parent_iter;
- printf("up\n");
- gtk_tree_path_free(path);
- if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
- printf("fail\n");
- return FALSE;
- } else {
- path = gtk_tree_model_get_path(model, &parent_iter);
- printf("depth = %d\n", gtk_tree_path_get_depth(path));
- if (gtk_tree_path_get_depth(path) <= mindepth) {
- gtk_tree_path_free(path);
- printf("limit by mindepth\n");
- return FALSE;
- }
- gtk_tree_path_free(path);
- return prev_iter(model, &parent_iter, prev, mindepth);
- }
- }
-}
-
-gint
-fi_prev(GtkWidget * widget, gpointer data) {
- fi_t * fi = data;
- GtkTreeModel * model = fi->model;
- GtkTreeIter iter = fi->iter_track;
- GtkTreeIter prev;
-
- if (!prev_iter(model, &iter, &prev, fi->mindepth)) {
- return TRUE;
- }
- free(fi->name);
- free(fi->filename);
- fi->iter_track = prev;
- fi->mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
-
- printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &prev), fi->name); // leak
- return TRUE;
-}
-
-gint
-fi_next(GtkWidget * widget, gpointer data) {
- fi_t * fi = data;
- GtkTreeModel * model = fi->model;
- GtkTreeIter iter = fi->iter_track;
- GtkTreeIter next;
-
- if (!next_iter(model, &iter, &next, fi->mindepth)) {
- return TRUE;
- }
- free(fi->name);
- free(fi->filename);
- fi->iter_track = next;
- fi->mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
-
- printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &next), fi->name); // leak
- return TRUE;
-}
-
void
fi_add_file_table_row(char * caption, GtkWidget ** entry, GtkWidget * table, int row) {
GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
@@ -1858,6 +1780,19 @@
char str[MAXLEN];
gchar * file_display;
+ if (!fi->media_ok) {
+ if (GTK_IS_ENTRY(fi->entry_name)) gtk_entry_set_text(GTK_ENTRY(fi->entry_name), fi->name);
+ if (GTK_IS_ENTRY(fi->entry_path)) gtk_entry_set_text(GTK_ENTRY(fi->entry_path), "(unable to open)");
+ if (GTK_IS_ENTRY(fi->entry_format)) gtk_entry_set_text(GTK_ENTRY(fi->entry_format), "");
+ if (GTK_IS_ENTRY(fi->entry_length)) gtk_entry_set_text(GTK_ENTRY(fi->entry_length), "");
+ if (GTK_IS_ENTRY(fi->entry_sr)) gtk_entry_set_text(GTK_ENTRY(fi->entry_sr), "");
+ if (GTK_IS_ENTRY(fi->entry_ch)) gtk_entry_set_text(GTK_ENTRY(fi->entry_ch), "");
+ if (GTK_IS_ENTRY(fi->entry_bw)) gtk_entry_set_text(GTK_ENTRY(fi->entry_bw), "");
+ if (GTK_IS_ENTRY(fi->entry_nsamples)) gtk_entry_set_text(GTK_ENTRY(fi->entry_nsamples), "");
+ if (GTK_IS_ENTRY(fi->entry_mode)) gtk_entry_set_text(GTK_ENTRY(fi->entry_mode), "");
+ return;
+ }
+
/* Heading */
gtk_entry_set_text(GTK_ENTRY(fi->entry_name), fi->name);
@@ -1866,17 +1801,19 @@
gtk_entry_set_text(GTK_ENTRY(fi->entry_path), file_display);
g_free(file_display);
- if (options.show_cover_for_ms_tracks_only == TRUE) {
- if (fi->display_cover == TRUE) {
- display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, fi->filename, FALSE, TRUE);
- } else {
- hide_cover_thumbnail();
- }
- } else {
- display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, fi->filename, FALSE, TRUE);
- }
+ if (!fi->cover_set_from_apic) {
+ if (options.show_cover_for_ms_tracks_only == TRUE) {
+ if (fi->display_cover == TRUE) {
+ display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
+ THUMB_SIZE, THUMB_SIZE, fi->filename, TRUE, TRUE);
+ } else {
+ hide_cover_thumbnail();
+ }
+ } else {
+ display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
+ THUMB_SIZE, THUMB_SIZE, fi->filename, TRUE, TRUE);
+ }
+ }
/* Audio data */
@@ -1932,10 +1869,14 @@
}
/* Fill up internal data with values from referenced file.
- * Return 0 if successful, <0 on error.
+ * Return TRUE if successful, FALSE on error.
*/
-int fi_init(fi_t * fi) {
+gboolean
+fi_media_init(fi_t * fi) {
+ fi->bail_out = 0;
+ fi->trash = trashlist_new();
+
#ifdef HAVE_CDDA
if (g_str_has_prefix(fi->filename, "CDDA ")) {
@@ -1945,12 +1886,12 @@
cdda_drive_t * drive;
if (sscanf(fi->filename, "CDDA %s %lX %u", device_path, &hash, &track) < 3) {
- return -1;
+ return FALSE;
}
drive = cdda_get_drive_by_device_path(device_path);
if ((drive == NULL) || (drive->disc.hash == 0L)) {
- return -1;
+ return FALSE;
}
fi->is_cdda = 1;
@@ -1967,13 +1908,13 @@
if (!fi->is_cdda) {
fi->fdec = file_decoder_new();
if (fi->fdec == NULL) {
- return -1;
+ return FALSE;
}
file_decoder_set_meta_cb(fi->fdec, fi_procmeta, fi);
if (file_decoder_open(fi->fdec, fi->filename) != 0) {
fi->bail_out = 1;
- return -1;
+ return FALSE;
}
file_decoder_send_metadata(fi->fdec);
@@ -1986,10 +1927,67 @@
fi->fileinfo.bps = fi->fdec->fileinfo.bps;
fi->fileinfo.total_samples = fi->fdec->fileinfo.total_samples;
}
- return 0;
+ return TRUE;
}
void
+fi_reload(fi_t * fi, GtkTreeIter iter) {
+ int i;
+
+ fi->selected_tag = fi->pageidx[gtk_notebook_get_current_page(GTK_NOTEBOOK(fi->nb))].tag;
+
+ fi_unload(fi);
+ fi->iter_track = iter;
+ fi->mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
+
+ /* remove any metadata pages from notebook */
+ while (gtk_notebook_get_n_pages(GTK_NOTEBOOK(fi->nb)) > 1) {
+ gtk_notebook_remove_page(GTK_NOTEBOOK(fi->nb), 1);
+ }
+ fi->n_pages = 1;
+ for (i = 1; i < FI_MAXPAGES; i++) {
+ fi->pageidx[i].tag = FALSE; //XXX
+ }
+
+ fi->media_ok = fi_media_init(fi);
+ fi_set_common_entries(fi);
+}
+
+gint
+fi_prev(GtkWidget * widget, gpointer data) {
+ fi_t * fi = data;
+ GtkTreeModel * model = fi->model;
+ GtkTreeIter iter = fi->iter_track;
+ GtkTreeIter prev;
+
+ if (fi_can_close(fi) != TRUE) {
+ return TRUE;
+ }
+ if (!tree_model_prev_iter(model, &iter, &prev, fi->mindepth)) {
+ return TRUE;
+ }
+ fi_reload(fi, prev);
+ return TRUE;
+}
+
+gint
+fi_next(GtkWidget * widget, gpointer data) {
+ fi_t * fi = data;
+ GtkTreeModel * model = fi->model;
+ GtkTreeIter iter = fi->iter_track;
+ GtkTreeIter next;
+
+ if (fi_can_close(fi) != TRUE) {
+ return TRUE;
+ }
+ if (!tree_model_next_iter(model, &iter, &next, fi->mindepth)) {
+ return TRUE;
+ }
+ fi_reload(fi, next);
+ return TRUE;
+}
+
+void
show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
fileinfo_model_func_t mfun, int mindepth,
gboolean allow_ms_import, gboolean display_cover) {
@@ -2017,14 +2015,6 @@
fi->display_cover = display_cover;
mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
- if (fi_init(fi) < 0) {
- fprintf(stderr, "error: fi_init() failed (file: '%s')\n", fi->filename);
- fi_delete(fi);
- return;
- }
-
- fi->trash = trashlist_new();
-
fi->info_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
register_toplevel_window(fi->info_window, TOP_WIN_SKIN | TOP_WIN_TRAY);
gtk_window_set_title(GTK_WINDOW(fi->info_window), _("File info"));
@@ -2071,6 +2061,7 @@
label_file = gtk_label_new(_("Audio data"));
fi->pageidx[0].tag = -1;
gtk_notebook_append_page(GTK_NOTEBOOK(fi->nb), vbox_file, label_file);
+ fi->n_pages = 1;
fi_add_file_table_row(_("Format:"), &fi->entry_format, table_file, 0);
fi_add_file_table_row(_("Length:"), &fi->entry_length, table_file, 1);
@@ -2107,6 +2098,7 @@
gtk_widget_show_all(fi->info_window);
+ fi->media_ok = fi_media_init(fi);
fi_set_common_entries(fi);
fi_set_page(fi);
Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/metadata.c 2014-05-04 22:07:31 UTC (rev 1295)
@@ -1046,7 +1046,6 @@
/* debug functions */
-/*
void
metadata_dump(metadata_t * meta) {
@@ -1067,4 +1066,3 @@
printf("int %d float %f ptr %p len %d\n",
frame->int_val, frame->float_val, frame->data, frame->length);
}
-*/
Modified: trunk/src/metadata.h
===================================================================
--- trunk/src/metadata.h 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/metadata.h 2014-05-04 22:07:31 UTC (rev 1295)
@@ -256,10 +256,8 @@
/* debug functions */
-/*
void metadata_dump(metadata_t * meta);
void meta_dump_frame(meta_frame_t * frame);
-*/
G_END_DECLS
Modified: trunk/src/store_file.c
===================================================================
--- trunk/src/store_file.c 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/store_file.c 2014-05-04 22:07:31 UTC (rev 1295)
@@ -2685,7 +2685,7 @@
if (gtk_tree_selection_get_selected(music_select, &model, &iter_track)) {
show_file_info(model, iter_track, store_model_func, 1,
- is_store_iter_readonly(&iter_track), TRUE);
+ is_store_iter_readonly(&iter_track) ? FALSE : TRUE, TRUE);
}
}
Modified: trunk/src/utils_gui.c
===================================================================
--- trunk/src/utils_gui.c 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/utils_gui.c 2014-05-04 22:07:31 UTC (rev 1295)
@@ -28,6 +28,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gdk/gdk.h>
+#include <gtk/gtk.h>
#include "common.h"
#include "i18n.h"
@@ -823,5 +824,77 @@
}
}
+/* Functions to traverse leafs of a generic GtkTreeModel
+ * (used by file info dialog's prev/next file feature)
+ */
+gboolean
+tree_model_leaf_iter(GtkTreeModel * model, GtkTreeIter * iter, gboolean last, GtkTreeIter * out) {
+ if (gtk_tree_model_iter_has_child(model, iter)) {
+ GtkTreeIter child_iter;
+ gint nth = 0;
+ if (last) {
+ nth = gtk_tree_model_iter_n_children(model, iter) - 1;
+ }
+ if (!gtk_tree_model_iter_nth_child(model, &child_iter, iter, nth)) {
+ return FALSE;
+ } else {
+ return tree_model_leaf_iter(model, &child_iter, last, out);
+ }
+ } else {
+ *out = *iter;
+ return TRUE;
+ }
+}
+
+gboolean
+tree_model_next_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * next, int mindepth) {
+ GtkTreeIter copy = *iter;
+ if (gtk_tree_model_iter_next(model, ©)) {
+ *iter = copy;
+ return tree_model_leaf_iter(model, iter, FALSE, next);
+ } else {
+ GtkTreeIter parent_iter;
+ if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
+ return FALSE;
+ } else {
+ GtkTreePath * path = gtk_tree_model_get_path(model, &parent_iter);
+ if (gtk_tree_path_get_depth(path) <= mindepth) {
+ gtk_tree_path_free(path);
+ return FALSE;
+ }
+ gtk_tree_path_free(path);
+ return tree_model_next_iter(model, &parent_iter, next, mindepth);
+ }
+ }
+}
+
+gboolean
+tree_model_prev_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * prev, int mindepth) {
+ GtkTreePath * path = gtk_tree_model_get_path(model, iter);
+ if (gtk_tree_path_prev(path)) {
+ if (!gtk_tree_model_get_iter(model, iter, path)) {
+ gtk_tree_path_free(path);
+ return FALSE;
+ } else {
+ gtk_tree_path_free(path);
+ return tree_model_leaf_iter(model, iter, TRUE, prev);
+ }
+ } else {
+ GtkTreeIter parent_iter;
+ gtk_tree_path_free(path);
+ if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
+ return FALSE;
+ } else {
+ path = gtk_tree_model_get_path(model, &parent_iter);
+ if (gtk_tree_path_get_depth(path) <= mindepth) {
+ gtk_tree_path_free(path);
+ return FALSE;
+ }
+ gtk_tree_path_free(path);
+ return tree_model_prev_iter(model, &parent_iter, prev, mindepth);
+ }
+ }
+}
+
// vim: shiftwidth=8:tabstop=8:softtabstop=8:
Modified: trunk/src/utils_gui.h
===================================================================
--- trunk/src/utils_gui.h 2014-05-04 22:07:14 UTC (rev 1294)
+++ trunk/src/utils_gui.h 2014-05-04 22:07:31 UTC (rev 1295)
@@ -95,6 +95,9 @@
void set_option_from_entry(GtkWidget * widget, char * opt, int n);
void set_option_bit_from_toggle(GtkWidget * toggle, int * opt, int bit);
+gboolean tree_model_leaf_iter(GtkTreeModel * model, GtkTreeIter * iter, gboolean last, GtkTreeIter * out);
+gboolean tree_model_next_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * next, int mindepth);
+gboolean tree_model_prev_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * prev, int mindepth);
#endif /* AQUALUNG_UTILS_GUI_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-04 22:07:17
|
Revision: 1294
http://sourceforge.net/p/aqualung/code/1294
Author: tszilagyi
Date: 2014-05-04 22:07:14 +0000 (Sun, 04 May 2014)
Log Message:
-----------
Refactor file_info using so-called subroutines
Modified Paths:
--------------
trunk/src/file_info.c
trunk/src/file_info.h
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-04 22:06:57 UTC (rev 1293)
+++ trunk/src/file_info.c 2014-05-04 22:07:14 UTC (rev 1294)
@@ -93,20 +93,39 @@
} pageidx_t;
typedef struct {
- gboolean allow_ms_import;
- int bail_out;
+ /* arguments to show_file_info */
+ GtkTreeModel * model;
+ GtkTreeIter iter_track;
fileinfo_model_func_t mfun;
int mindepth;
+ gboolean allow_ms_import;
+ gboolean display_cover;
+
+ /* entries containing displayed data */
+ GtkWidget * entry_name;
+ GtkWidget * entry_path;
+ GtkWidget * cover_image_area;
+ GtkWidget * entry_format;
+ GtkWidget * entry_length;
+ GtkWidget * entry_sr;
+ GtkWidget * entry_ch;
+ GtkWidget * entry_bw;
+ GtkWidget * entry_nsamples;
+ GtkWidget * entry_mode;
+
+ /* work data */
char * name;
char * filename;
+ decoder_t * dec;
+ int is_cdda;
+ fileinfo_t fileinfo;
+
+ int bail_out;
file_decoder_t * fdec;
metadata_t * meta;
trashlist_t * trash;
- GtkTreeModel * model;
- GtkTreeIter track_iter;
GtkWidget * info_window;
GtkWidget * event_box;
- GtkWidget * cover_image_area;
GtkWidget * cover_align;
GtkWidget * hbox;
GtkWidget * button_table;
@@ -464,7 +483,7 @@
fi_t * fi = data->fi;
meta_frame_t * frame = data->frame;
GtkTreeModel * model = fi->model;
- GtkTreeIter track_iter = fi->track_iter;
+ GtkTreeIter iter_track = fi->iter_track;
GtkTreeIter record_iter;
GtkTreeIter artist_iter;
GtkTreePath * path;
@@ -479,25 +498,25 @@
switch (data->dest_type) {
case IMPORT_DEST_TITLE:
- gtk_tree_store_set(music_store, &track_iter, MS_COL_NAME, frame->field_val, -1);
- music_store_mark_changed(&track_iter);
+ gtk_tree_store_set(music_store, &iter_track, MS_COL_NAME, frame->field_val, -1);
+ music_store_mark_changed(&iter_track);
break;
case IMPORT_DEST_RECORD:
- gtk_tree_model_iter_parent(model, &record_iter, &track_iter);
+ gtk_tree_model_iter_parent(model, &record_iter, &iter_track);
gtk_tree_store_set(music_store, &record_iter, MS_COL_NAME, frame->field_val, -1);
music_store_mark_changed(&record_iter);
break;
case IMPORT_DEST_ARTIST:
- gtk_tree_model_iter_parent(model, &record_iter, &track_iter);
+ gtk_tree_model_iter_parent(model, &record_iter, &iter_track);
gtk_tree_model_iter_parent(model, &artist_iter, &record_iter);
gtk_tree_store_set(music_store, &artist_iter, MS_COL_NAME, frame->field_val, -1);
gtk_tree_store_set(music_store, &artist_iter, MS_COL_SORT, frame->field_val, -1);
- path = gtk_tree_model_get_path(model, &track_iter);
+ path = gtk_tree_model_get_path(model, &iter_track);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(music_tree), path, NULL, TRUE, 0.5f, 0.0f);
music_store_mark_changed(&artist_iter);
break;
case IMPORT_DEST_YEAR:
- gtk_tree_model_iter_parent(model, &record_iter, &track_iter);
+ gtk_tree_model_iter_parent(model, &record_iter, &iter_track);
gtk_tree_model_get(GTK_TREE_MODEL(music_store), &record_iter, MS_COL_DATA, &record_data, -1);
if (sscanf(frame->field_val, "%d", &record_data->year) < 1) {
char msg[MAXLEN];
@@ -515,11 +534,11 @@
break;
case IMPORT_DEST_NUMBER:
snprintf(tmp, MAXLEN-1, "%02d", frame->int_val);
- gtk_tree_store_set(music_store, &track_iter, MS_COL_SORT, tmp, -1);
- music_store_mark_changed(&track_iter);
+ gtk_tree_store_set(music_store, &iter_track, MS_COL_SORT, tmp, -1);
+ music_store_mark_changed(&iter_track);
break;
case IMPORT_DEST_COMMENT:
- gtk_tree_model_get(model, &track_iter, MS_COL_DATA, &track_data, -1);
+ gtk_tree_model_get(model, &iter_track, MS_COL_DATA, &track_data, -1);
tmp[0] = '\0';
if (track_data->comment != NULL) {
strncat(tmp, track_data->comment, MAXLEN-1);
@@ -529,13 +548,13 @@
}
strncat(tmp, frame->field_val, MAXLEN-1);
free_strdup(&track_data->comment, tmp);
- music_store_mark_changed(&track_iter);
+ music_store_mark_changed(&iter_track);
break;
case IMPORT_DEST_RVA:
- gtk_tree_model_get(model, &track_iter, MS_COL_DATA, &track_data, -1);
+ gtk_tree_model_get(model, &iter_track, MS_COL_DATA, &track_data, -1);
track_data->rva = frame->float_val;
track_data->use_rva = 1;
- music_store_mark_changed(&track_iter);
+ music_store_mark_changed(&iter_track);
break;
}
}
@@ -1786,7 +1805,7 @@
fi_prev(GtkWidget * widget, gpointer data) {
fi_t * fi = data;
GtkTreeModel * model = fi->model;
- GtkTreeIter iter = fi->track_iter;
+ GtkTreeIter iter = fi->iter_track;
GtkTreeIter prev;
if (!prev_iter(model, &iter, &prev, fi->mindepth)) {
@@ -1794,8 +1813,8 @@
}
free(fi->name);
free(fi->filename);
- fi->track_iter = prev;
- fi->mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+ fi->iter_track = prev;
+ fi->mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &prev), fi->name); // leak
return TRUE;
@@ -1805,7 +1824,7 @@
fi_next(GtkWidget * widget, gpointer data) {
fi_t * fi = data;
GtkTreeModel * model = fi->model;
- GtkTreeIter iter = fi->track_iter;
+ GtkTreeIter iter = fi->iter_track;
GtkTreeIter next;
if (!next_iter(model, &iter, &next, fi->mindepth)) {
@@ -1813,54 +1832,110 @@
}
free(fi->name);
free(fi->filename);
- fi->track_iter = next;
- fi->mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+ fi->iter_track = next;
+ fi->mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &next), fi->name); // leak
return TRUE;
}
void
-show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
- fileinfo_model_func_t mfun, int mindepth,
- gboolean allow_ms_import, gboolean cover_flag) {
+fi_add_file_table_row(char * caption, GtkWidget ** entry, GtkWidget * table, int row) {
+ GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget * label = gtk_label_new(caption);
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, row, row+1, GTK_FILL, GTK_FILL, 5, 3);
+ *entry = gtk_entry_new();
+ gtk_widget_set_size_request(*entry, 350, -1);
+ gtk_widget_set_can_focus(*entry, FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(*entry), FALSE);
+ gtk_table_attach(GTK_TABLE(table), *entry, 1, 2, row, row+1,
+ (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
+}
+void
+fi_set_common_entries(fi_t * fi) {
char str[MAXLEN];
gchar * file_display;
- GtkWidget * vbox;
- GtkWidget * hbox_t;
- GtkWidget * table;
- GtkWidget * hbox_name;
- GtkWidget * label_name;
- GtkWidget * entry_name;
- GtkWidget * hbox_path;
- GtkWidget * label_path;
- GtkWidget * entry_path;
- GtkWidget * dismiss_btn;
+ /* Heading */
- GtkWidget * vbox_file;
- GtkWidget * label_file;
- GtkWidget * table_file;
- GtkWidget * hbox;
- GtkWidget * label;
- GtkWidget * entry;
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_name), fi->name);
- decoder_t * dec = NULL;
- int is_cdda = 0;
- fileinfo_t fileinfo;
+ file_display = g_filename_display_name(fi->filename);
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_path), file_display);
+ g_free(file_display);
- fi_t * fi = fi_new();
- if (fi == NULL) {
- return;
+ if (options.show_cover_for_ms_tracks_only == TRUE) {
+ if (fi->display_cover == TRUE) {
+ display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
+ 48, 48, fi->filename, FALSE, TRUE);
+ } else {
+ hide_cover_thumbnail();
+ }
+ } else {
+ display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
+ 48, 48, fi->filename, FALSE, TRUE);
+ }
+
+ /* Audio data */
+
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_format), fi->fileinfo.format_str);
+
+ if (fi->fileinfo.total_samples == 0) {
+ strcpy(str, "N/A");
+ } else {
+ sample2time(fi->fileinfo.sample_rate, fi->fileinfo.total_samples, str, 0);
}
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_length), str);
- fi->mfun = mfun;
- fi->mindepth = mindepth;
- fi->model = model;
- fi->track_iter = iter_track;
- mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+ sprintf(str, _("%ld Hz"), fi->fileinfo.sample_rate);
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_sr), str);
+ if (fi->fileinfo.is_mono) {
+ strcpy(str, _("MONO"));
+ } else {
+ strcpy(str, _("STEREO"));
+ }
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_ch), str);
+
+ if (fi->fileinfo.bps == 0) {
+ strcpy(str, "N/A kbit/s");
+ } else {
+ format_bps_label(fi->fileinfo.bps, fi->fileinfo.format_flags, str);
+ }
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_bw), str);
+
+ if (fi->fileinfo.total_samples == 0) {
+ strcpy(str, "N/A");
+ } else {
+ sprintf(str, "%lld", fi->fileinfo.total_samples);
+ }
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_nsamples), str);
+
+#ifdef HAVE_WAVPACK
+ if (!is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
+ wavpack_pdata_t * pd = (wavpack_pdata_t *)dec->pdata;
+ int mode = WavpackGetMode(pd->wpc);
+
+ if ((mode & MODE_LOSSLESS) && (mode & MODE_WVC)) {
+ strncpy(str, "Hybrid Lossless", MAXLEN-1);
+ } else if (mode & MODE_LOSSLESS) {
+ strncpy(str, "Lossless", MAXLEN-1);
+ } else {
+ strncpy(str, "Hybrid Lossy", MAXLEN-1);
+ }
+ cut_trailing_whitespace(str);
+ gtk_entry_set_text(GTK_ENTRY(fi->entry_mode), str);
+ }
+#endif /* HAVE_WAVPACK */
+}
+
+/* Fill up internal data with values from referenced file.
+ * Return 0 if successful, <0 on error.
+ */
+int fi_init(fi_t * fi) {
+
#ifdef HAVE_CDDA
if (g_str_has_prefix(fi->filename, "CDDA ")) {
@@ -1870,54 +1945,84 @@
cdda_drive_t * drive;
if (sscanf(fi->filename, "CDDA %s %lX %u", device_path, &hash, &track) < 3) {
- fi_delete(fi);
- return;
+ return -1;
}
drive = cdda_get_drive_by_device_path(device_path);
if ((drive == NULL) || (drive->disc.hash == 0L)) {
- fi_delete(fi);
- return;
+ return -1;
}
- is_cdda = 1;
+ fi->is_cdda = 1;
- fileinfo.format_str = _("Audio CD");
- fileinfo.sample_rate = 44100;
- fileinfo.is_mono = 0;
- fileinfo.format_flags = 0;
- fileinfo.bps = 2*16*44100;
- fileinfo.total_samples = (drive->disc.toc[track] - drive->disc.toc[track-1]) * 588;
+ fi->fileinfo.format_str = _("Audio CD");
+ fi->fileinfo.sample_rate = 44100;
+ fi->fileinfo.is_mono = 0;
+ fi->fileinfo.format_flags = 0;
+ fi->fileinfo.bps = 2*16*44100;
+ fi->fileinfo.total_samples = (drive->disc.toc[track] - drive->disc.toc[track-1]) * 588;
}
#endif /* HAVE_CDDA */
- if (!is_cdda) {
+ if (!fi->is_cdda) {
fi->fdec = file_decoder_new();
if (fi->fdec == NULL) {
- fi_delete(fi);
- return;
+ return -1;
}
file_decoder_set_meta_cb(fi->fdec, fi_procmeta, fi);
if (file_decoder_open(fi->fdec, fi->filename) != 0) {
fi->bail_out = 1;
- fi_delete(fi);
- return;
+ return -1;
}
file_decoder_send_metadata(fi->fdec);
+ fi->dec = (decoder_t *)fi->fdec->pdec;
- dec = (decoder_t *)fi->fdec->pdec;
+ fi->fileinfo.format_str = fi->dec->format_str;
+ fi->fileinfo.sample_rate = fi->fdec->fileinfo.sample_rate;
+ fi->fileinfo.is_mono = fi->fdec->fileinfo.is_mono;
+ fi->fileinfo.format_flags = fi->fdec->fileinfo.format_flags;
+ fi->fileinfo.bps = fi->fdec->fileinfo.bps;
+ fi->fileinfo.total_samples = fi->fdec->fileinfo.total_samples;
+ }
+ return 0;
+}
- fileinfo.format_str = dec->format_str;
- fileinfo.sample_rate = fi->fdec->fileinfo.sample_rate;
- fileinfo.is_mono = fi->fdec->fileinfo.is_mono;
- fileinfo.format_flags = fi->fdec->fileinfo.format_flags;
- fileinfo.bps = fi->fdec->fileinfo.bps;
- fileinfo.total_samples = fi->fdec->fileinfo.total_samples;
+void
+show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
+ fileinfo_model_func_t mfun, int mindepth,
+ gboolean allow_ms_import, gboolean display_cover) {
+
+ GtkWidget * vbox;
+ GtkWidget * hbox_t;
+ GtkWidget * table;
+ GtkWidget * dismiss_btn;
+
+ GtkWidget * vbox_file;
+ GtkWidget * label_file;
+ GtkWidget * table_file;
+
+ fi_t * fi = fi_new();
+ if (fi == NULL) {
+ return;
}
+ /* save arguments */
+ fi->model = model;
+ fi->iter_track = iter_track;
+ fi->mfun = mfun;
+ fi->mindepth = mindepth;
fi->allow_ms_import = allow_ms_import;
+ fi->display_cover = display_cover;
+ mfun(fi->model, fi->iter_track, &fi->name, &fi->filename);
+
+ if (fi_init(fi) < 0) {
+ fprintf(stderr, "error: fi_init() failed (file: '%s')\n", fi->filename);
+ fi_delete(fi);
+ return;
+ }
+
fi->trash = trashlist_new();
fi->info_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1941,34 +2046,9 @@
table = gtk_table_new(2, 2, FALSE);
gtk_box_pack_start(GTK_BOX(hbox_t), table, TRUE, TRUE, 4);
- hbox_name = gtk_hbox_new(FALSE, 0);
- label_name = gtk_label_new(_("Track:"));
- gtk_box_pack_start(GTK_BOX(hbox_name), label_name, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox_name, 0, 1, 0, 1,
- GTK_FILL, GTK_FILL, 5, 2);
+ fi_add_file_table_row(_("Track:"), &fi->entry_name, table, 0);
+ fi_add_file_table_row(_("File:"), &fi->entry_path, table, 1);
- entry_name = gtk_entry_new();
- gtk_widget_set_can_focus(entry_name, FALSE);
- gtk_entry_set_text(GTK_ENTRY(entry_name), fi->name);
- gtk_editable_set_editable(GTK_EDITABLE(entry_name), FALSE);
- gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, 0, 1,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 2);
-
- hbox_path = gtk_hbox_new(FALSE, 0);
- label_path = gtk_label_new(_("File:"));
- gtk_box_pack_start(GTK_BOX(hbox_path), label_path, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox_path, 0, 1, 1, 2,
- GTK_FILL, GTK_FILL, 5, 2);
-
- file_display = g_filename_display_name(fi->filename);
- entry_path = gtk_entry_new();
- gtk_widget_set_can_focus(entry_path, FALSE);
- gtk_entry_set_text(GTK_ENTRY(entry_path), file_display);
- g_free(file_display);
- gtk_editable_set_editable(GTK_EDITABLE(entry_path), FALSE);
- gtk_table_attach(GTK_TABLE(table), entry_path, 1, 2, 1, 2,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 2);
-
fi->cover_align = gtk_alignment_new(0.5f, 0.5f, 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(hbox_t), fi->cover_align, FALSE, FALSE, 0);
fi->cover_image_area = gtk_image_new();
@@ -1977,19 +2057,6 @@
gtk_container_add (GTK_CONTAINER (fi->event_box), fi->cover_image_area);
g_signal_connect(G_OBJECT(fi->event_box), "button_press_event",
G_CALLBACK(fi_cover_press_button_cb), (gpointer)fi);
-
- if (options.show_cover_for_ms_tracks_only == TRUE) {
- if (cover_flag == TRUE) {
- display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, fi->filename, FALSE, TRUE);
- } else {
- hide_cover_thumbnail();
- }
- } else {
- display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, fi->filename, FALSE, TRUE);
- }
-
fi->hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), fi->hbox, FALSE, FALSE, 5);
@@ -2005,137 +2072,31 @@
fi->pageidx[0].tag = -1;
gtk_notebook_append_page(GTK_NOTEBOOK(fi->nb), vbox_file, label_file);
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Format:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_size_request(entry, 350, -1);
- gtk_widget_set_can_focus(entry, FALSE);
- gtk_entry_set_text(GTK_ENTRY(entry), fileinfo.format_str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 0, 1,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Length:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
- if (fileinfo.total_samples == 0) {
- strcpy(str, "N/A");
- } else {
- sample2time(fileinfo.sample_rate, fileinfo.total_samples, str, 0);
- }
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 1, 2,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Samplerate:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
- sprintf(str, _("%ld Hz"), fileinfo.sample_rate);
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 2, 3,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Channel count:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
- if (fileinfo.is_mono)
- strcpy(str, _("MONO"));
- else
- strcpy(str, _("STEREO"));
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 3, 4,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Bandwidth:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
- if (fileinfo.bps == 0) {
- strcpy(str, "N/A kbit/s");
- } else {
- format_bps_label(fileinfo.bps, fileinfo.format_flags, str);
- }
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 4, 5,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Total samples:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 5, 6, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
- if (fileinfo.total_samples == 0) {
- strcpy(str, "N/A");
- } else {
- sprintf(str, "%lld", fileinfo.total_samples);
- }
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 5, 6,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
-
+ fi_add_file_table_row(_("Format:"), &fi->entry_format, table_file, 0);
+ fi_add_file_table_row(_("Length:"), &fi->entry_length, table_file, 1);
+ fi_add_file_table_row(_("Samplerate:"), &fi->entry_sr, table_file, 2);
+ fi_add_file_table_row(_("Channel count:"), &fi->entry_ch, table_file, 3);
+ fi_add_file_table_row(_("Bandwidth:"), &fi->entry_bw, table_file, 4);
+ fi_add_file_table_row(_("Total samples:"), &fi->entry_nsamples, table_file, 5);
#ifdef HAVE_WAVPACK
if (!is_cdda && fi->fdec->file_lib == WAVPACK_LIB) {
- wavpack_pdata_t * pd = (wavpack_pdata_t *)dec->pdata;
- int mode = WavpackGetMode(pd->wpc);
-
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Mode:"));
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table_file), hbox, 0, 1, 7, 8, GTK_FILL, GTK_FILL, 5, 3);
- entry = gtk_entry_new();
- gtk_widget_set_can_focus(entry, FALSE);
-
- if ((mode & MODE_LOSSLESS) && (mode & MODE_WVC)) {
- strncpy(str, "Hybrid Lossless", MAXLEN-1);
- } else if (mode & MODE_LOSSLESS) {
- strncpy(str, "Lossless", MAXLEN-1);
- } else {
- strncpy(str, "Hybrid Lossy", MAXLEN-1);
- }
- cut_trailing_whitespace(str);
- gtk_entry_set_text(GTK_ENTRY(entry), str);
- gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
- gtk_table_attach(GTK_TABLE(table_file), entry, 1, 2, 7, 8,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 3);
+ fi_add_file_table_row(_("Mode:"), &fi->entry_mode, table_file, 6);
}
#endif /* HAVE_WAVPACK */
-
/* end of notebook stuff */
-
gtk_widget_grab_focus(fi->nb);
fi->button_table = gtk_table_new(1, 2, FALSE);
gtk_box_pack_end(GTK_BOX(fi->hbox), fi->button_table, FALSE, TRUE, 2);
fi->prev_button = gui_stock_label_button(NULL, GTK_STOCK_GO_BACK);
- g_signal_connect(fi->prev_button, "clicked",
- G_CALLBACK(fi_prev), (gpointer)fi);
+ g_signal_connect(fi->prev_button, "clicked", G_CALLBACK(fi_prev), (gpointer)fi);
gtk_table_attach(GTK_TABLE(fi->button_table), fi->prev_button,
1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
fi->next_button = gui_stock_label_button(NULL, GTK_STOCK_GO_FORWARD);
- g_signal_connect(fi->next_button, "clicked",
- G_CALLBACK(fi_next), (gpointer)fi);
+ g_signal_connect(fi->next_button, "clicked", G_CALLBACK(fi_next), (gpointer)fi);
gtk_table_attach(GTK_TABLE(fi->button_table), fi->next_button,
2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
@@ -2146,6 +2107,7 @@
gtk_widget_show_all(fi->info_window);
+ fi_set_common_entries(fi);
fi_set_page(fi);
/* fi_t object is freed in info_window destroy handlers */
@@ -2221,6 +2183,20 @@
set_first_row(fi);
}
+static void
+module_info_add_row(char * caption, GtkWidget ** mod_label, GtkWidget * table, int row) {
+ GtkWidget * label = gtk_label_new(caption);
+ gtk_widget_show(label);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1,
+ (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+
+ *mod_label = gtk_label_new("");
+ gtk_widget_show(*mod_label);
+ gtk_table_attach(GTK_TABLE(table), *mod_label, 1, 2, row, row+1,
+ (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
+}
+
void
module_info_fill_page(fi_t * fi, meta_frame_t * frame, GtkWidget * vbox) {
@@ -2253,7 +2229,6 @@
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
-
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 0);
@@ -2263,7 +2238,6 @@
gtk_box_pack_start (GTK_BOX (hbox2), vbox2, FALSE, FALSE, 0);
if (mdi->instruments) {
-
table = gtk_table_new (5, 2, FALSE);
gtk_widget_show (table);
gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
@@ -2271,75 +2245,15 @@
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
- label = gtk_label_new (_("Type:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
+ module_info_add_row(_("Type:"), &mod_type_label, table, 0);
+ module_info_add_row(_("Channels:"), &mod_channels_label, table, 1);
+ module_info_add_row(_("Patterns:"), &mod_patterns_label, table, 2);
+ module_info_add_row(_("Samples:"), &mod_samples_label, table, 3);
+ module_info_add_row(_("Instruments:"), &mod_instruments_label, table, 4);
- mod_type_label = gtk_label_new ("");
- gtk_widget_show (mod_type_label);
- gtk_table_attach (GTK_TABLE (table), mod_type_label, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Channels:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_channels_label = gtk_label_new ("");
- gtk_widget_show (mod_channels_label);
- gtk_table_attach (GTK_TABLE (table), mod_channels_label, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Patterns:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_patterns_label = gtk_label_new ("");
- gtk_widget_show (mod_patterns_label);
- gtk_table_attach (GTK_TABLE (table), mod_patterns_label, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Samples:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_samples_label = gtk_label_new ("");
- gtk_widget_show (mod_samples_label);
- gtk_table_attach (GTK_TABLE (table), mod_samples_label, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Instruments:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_instruments_label = gtk_label_new ("");
- gtk_widget_show (mod_instruments_label);
- gtk_table_attach (GTK_TABLE (table), mod_instruments_label, 1, 2, 4, 5,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
sprintf(temp, "%d", mdi->instruments);
gtk_label_set_text (GTK_LABEL(mod_instruments_label), temp);
-
table = gtk_table_new (2, 1, FALSE);
gtk_widget_show (table);
gtk_box_pack_end (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
@@ -2359,10 +2273,7 @@
gtk_table_attach (GTK_TABLE (table), instruments_radiobutton, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
-
-
} else {
-
table = gtk_table_new (4, 2, FALSE);
gtk_widget_show (table);
gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
@@ -2370,57 +2281,11 @@
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
- label = gtk_label_new (_("Type:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_type_label = gtk_label_new ("");
- gtk_widget_show (mod_type_label);
- gtk_table_attach (GTK_TABLE (table), mod_type_label, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Channels:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_channels_label = gtk_label_new ("");
- gtk_widget_show (mod_channels_label);
- gtk_table_attach (GTK_TABLE (table), mod_channels_label, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Patterns:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_patterns_label = gtk_label_new ("");
- gtk_widget_show (mod_patterns_label);
- gtk_table_attach (GTK_TABLE (table), mod_patterns_label, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label = gtk_label_new (_("Samples:"));
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
- mod_samples_label = gtk_label_new ("");
- gtk_widget_show (mod_samples_label);
- gtk_table_attach (GTK_TABLE (table), mod_samples_label, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ module_info_add_row(_("Type:"), &mod_type_label, table, 0);
+ module_info_add_row(_("Channels:"), &mod_channels_label, table, 1);
+ module_info_add_row(_("Patterns:"), &mod_patterns_label, table, 2);
+ module_info_add_row(_("Samples:"), &mod_samples_label, table, 3);
+ module_info_add_row(_("Instruments:"), &mod_instruments_label, table, 4);
}
n = mdi->type;
Modified: trunk/src/file_info.h
===================================================================
--- trunk/src/file_info.h 2014-05-04 22:06:57 UTC (rev 1293)
+++ trunk/src/file_info.h 2014-05-04 22:07:14 UTC (rev 1294)
@@ -33,7 +33,7 @@
void show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
fileinfo_model_func_t fi_mfun, int mindepth,
- gboolean allow_ms_import, gboolean cover_flag);
+ gboolean allow_ms_import, gboolean display_cover);
#endif /* AQUALUNG_FILE_INFO_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-04 22:07:00
|
Revision: 1293
http://sourceforge.net/p/aqualung/code/1293
Author: tszilagyi
Date: 2014-05-04 22:06:57 +0000 (Sun, 04 May 2014)
Log Message:
-----------
Refactor file info dialog invocation and access to tree stores
This is needed to create a feature allowing to go to the previous /
next file in the natural order of wherever the file info dialog was
opened from, without closing and reopening the dialog.
The prev/next buttons to do this are already on the file info dialog,
but they don't yet rebuild the dialog content. However, the generic
tree traversal is already implemented, taking care that the containing
store (in case the dialog was opened from a file or podcast store)
cannot be left while browsing.
Modified Paths:
--------------
trunk/src/file_info.c
trunk/src/file_info.h
trunk/src/gui_main.c
trunk/src/playlist.c
trunk/src/playlist.h
trunk/src/store_file.c
trunk/src/store_podcast.c
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/file_info.c 2014-05-04 22:06:57 UTC (rev 1293)
@@ -93,8 +93,11 @@
} pageidx_t;
typedef struct {
- int is_called_from_browser;
+ gboolean allow_ms_import;
int bail_out;
+ fileinfo_model_func_t mfun;
+ int mindepth;
+ char * name;
char * filename;
file_decoder_t * fdec;
metadata_t * meta;
@@ -107,6 +110,8 @@
GtkWidget * cover_align;
GtkWidget * hbox;
GtkWidget * button_table;
+ GtkWidget * prev_button;
+ GtkWidget * next_button;
GtkWidget * save_button;
GtkWidget * nb;
GtkWidget * combo;
@@ -196,6 +201,7 @@
if (fi->fdec != NULL) {
file_decoder_delete(fi->fdec);
}
+ free(fi->name);
free(fi->filename);
for (i = 0; i < FI_MAXPAGES; i++) {
@@ -561,7 +567,7 @@
/* tabwidth is 2, +1 if called from Music Store, +1 if editable */
int tabwidth = 2;
- tabwidth += fi->is_called_from_browser? 1 : 0;
+ tabwidth += fi->allow_ms_import? 1 : 0;
tabwidth += meta->writable ? 1 : 0;
return tabwidth;
}
@@ -1428,7 +1434,7 @@
++col;
/* Import button */
- if (fi->is_called_from_browser) {
+ if (fi->allow_ms_import) {
importbtn = fi_procframe_importbtn(fi, frame);
gtk_table_attach(GTK_TABLE(table), importbtn, col, col+1, n_rows-1, n_rows,
GTK_FILL, GTK_FILL, 5, 3);
@@ -1651,7 +1657,7 @@
g_signal_connect(fi->save_button, "clicked",
G_CALLBACK(fi_save), (gpointer)fi);
gtk_table_attach(GTK_TABLE(fi->button_table), fi->save_button,
- 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 3);
+ 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
gtk_widget_show_all(fi->info_window);
}
@@ -1694,9 +1700,130 @@
}
+gboolean
+leaf_iter(GtkTreeModel * model, GtkTreeIter * iter, gboolean last, GtkTreeIter * out) {
+ if (gtk_tree_model_iter_has_child(model, iter)) {
+ GtkTreeIter child_iter;
+ printf("down\n");
+ gint nth = 0;
+ if (last) {
+ nth = gtk_tree_model_iter_n_children(model, iter) - 1;
+ }
+ if (!gtk_tree_model_iter_nth_child(model, &child_iter, iter, nth)) {
+ printf("fail nth_child\n");
+ return FALSE;
+ } else {
+ return leaf_iter(model, &child_iter, last, out);
+ }
+ } else {
+ printf("ready\n");
+ *out = *iter;
+ return TRUE;
+ }
+}
+
+gboolean
+next_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * next, int mindepth) {
+ GtkTreeIter copy = *iter;
+ if (gtk_tree_model_iter_next(model, ©)) {
+ printf("next\n");
+ *iter = copy;
+ return leaf_iter(model, iter, FALSE, next);
+ } else {
+ GtkTreeIter parent_iter;
+ printf("up\n");
+ if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
+ printf("fail\n");
+ return FALSE;
+ } else {
+ GtkTreePath * path = gtk_tree_model_get_path(model, &parent_iter);
+ if (gtk_tree_path_get_depth(path) <= mindepth) {
+ gtk_tree_path_free(path);
+ printf("limit by mindepth\n");
+ return FALSE;
+ }
+ gtk_tree_path_free(path);
+ return next_iter(model, &parent_iter, next, mindepth);
+ }
+ }
+}
+
+gboolean
+prev_iter(GtkTreeModel * model, GtkTreeIter * iter, GtkTreeIter * prev, int mindepth) {
+ GtkTreePath * path = gtk_tree_model_get_path(model, iter);
+ if (gtk_tree_path_prev(path)) {
+ printf("prev\n");
+ if (!gtk_tree_model_get_iter(model, iter, path)) {
+ printf("fail\n");
+ gtk_tree_path_free(path);
+ return FALSE;
+ } else {
+ gtk_tree_path_free(path);
+ return leaf_iter(model, iter, TRUE, prev);
+ }
+ } else {
+ GtkTreeIter parent_iter;
+ printf("up\n");
+ gtk_tree_path_free(path);
+ if (!gtk_tree_model_iter_parent(model, &parent_iter, iter)) {
+ printf("fail\n");
+ return FALSE;
+ } else {
+ path = gtk_tree_model_get_path(model, &parent_iter);
+ printf("depth = %d\n", gtk_tree_path_get_depth(path));
+ if (gtk_tree_path_get_depth(path) <= mindepth) {
+ gtk_tree_path_free(path);
+ printf("limit by mindepth\n");
+ return FALSE;
+ }
+ gtk_tree_path_free(path);
+ return prev_iter(model, &parent_iter, prev, mindepth);
+ }
+ }
+}
+
+gint
+fi_prev(GtkWidget * widget, gpointer data) {
+ fi_t * fi = data;
+ GtkTreeModel * model = fi->model;
+ GtkTreeIter iter = fi->track_iter;
+ GtkTreeIter prev;
+
+ if (!prev_iter(model, &iter, &prev, fi->mindepth)) {
+ return TRUE;
+ }
+ free(fi->name);
+ free(fi->filename);
+ fi->track_iter = prev;
+ fi->mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+
+ printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &prev), fi->name); // leak
+ return TRUE;
+}
+
+gint
+fi_next(GtkWidget * widget, gpointer data) {
+ fi_t * fi = data;
+ GtkTreeModel * model = fi->model;
+ GtkTreeIter iter = fi->track_iter;
+ GtkTreeIter next;
+
+ if (!next_iter(model, &iter, &next, fi->mindepth)) {
+ return TRUE;
+ }
+ free(fi->name);
+ free(fi->filename);
+ fi->track_iter = next;
+ fi->mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+
+ printf("now at: %s '%s'\n", gtk_tree_model_get_string_from_iter(model, &next), fi->name); // leak
+ return TRUE;
+}
+
void
-show_file_info(char * name, char * file, int is_called_from_browser,
- GtkTreeModel * model, GtkTreeIter track_iter, gboolean cover_flag) {
+show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
+ fileinfo_model_func_t mfun, int mindepth,
+ gboolean allow_ms_import, gboolean cover_flag) {
char str[MAXLEN];
gchar * file_display;
@@ -1719,9 +1846,7 @@
GtkWidget * label;
GtkWidget * entry;
-
decoder_t * dec = NULL;
-
int is_cdda = 0;
fileinfo_t fileinfo;
@@ -1730,20 +1855,28 @@
return;
}
+ fi->mfun = mfun;
+ fi->mindepth = mindepth;
+ fi->model = model;
+ fi->track_iter = iter_track;
+ mfun(fi->model, fi->track_iter, &fi->name, &fi->filename);
+
#ifdef HAVE_CDDA
- if (g_str_has_prefix(file, "CDDA ")) {
+ if (g_str_has_prefix(fi->filename, "CDDA ")) {
char device_path[CDDA_MAXLEN];
long hash;
int track;
cdda_drive_t * drive;
- if (sscanf(file, "CDDA %s %lX %u", device_path, &hash, &track) < 3) {
+ if (sscanf(fi->filename, "CDDA %s %lX %u", device_path, &hash, &track) < 3) {
+ fi_delete(fi);
return;
}
drive = cdda_get_drive_by_device_path(device_path);
if ((drive == NULL) || (drive->disc.hash == 0L)) {
+ fi_delete(fi);
return;
}
@@ -1766,8 +1899,9 @@
}
file_decoder_set_meta_cb(fi->fdec, fi_procmeta, fi);
- if (file_decoder_open(fi->fdec, file) != 0) {
+ if (file_decoder_open(fi->fdec, fi->filename) != 0) {
fi->bail_out = 1;
+ fi_delete(fi);
return;
}
@@ -1783,10 +1917,7 @@
fileinfo.total_samples = fi->fdec->fileinfo.total_samples;
}
- fi->is_called_from_browser = is_called_from_browser;
- fi->model = model;
- fi->track_iter = track_iter;
- fi->filename = strdup(file);
+ fi->allow_ms_import = allow_ms_import;
fi->trash = trashlist_new();
fi->info_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1818,7 +1949,7 @@
entry_name = gtk_entry_new();
gtk_widget_set_can_focus(entry_name, FALSE);
- gtk_entry_set_text(GTK_ENTRY(entry_name), name);
+ gtk_entry_set_text(GTK_ENTRY(entry_name), fi->name);
gtk_editable_set_editable(GTK_EDITABLE(entry_name), FALSE);
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, 0, 1,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 5, 2);
@@ -1829,7 +1960,7 @@
gtk_table_attach(GTK_TABLE(table), hbox_path, 0, 1, 1, 2,
GTK_FILL, GTK_FILL, 5, 2);
- file_display = g_filename_display_name(file);
+ file_display = g_filename_display_name(fi->filename);
entry_path = gtk_entry_new();
gtk_widget_set_can_focus(entry_path, FALSE);
gtk_entry_set_text(GTK_ENTRY(entry_path), file_display);
@@ -1850,13 +1981,13 @@
if (options.show_cover_for_ms_tracks_only == TRUE) {
if (cover_flag == TRUE) {
display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, file, FALSE, TRUE);
+ 48, 48, fi->filename, FALSE, TRUE);
} else {
hide_cover_thumbnail();
}
} else {
display_cover(fi->cover_image_area, fi->event_box, fi->cover_align,
- 48, 48, file, FALSE, TRUE);
+ 48, 48, fi->filename, FALSE, TRUE);
}
fi->hbox = gtk_hbox_new(FALSE, 0);
@@ -1993,13 +2124,25 @@
gtk_widget_grab_focus(fi->nb);
- fi->button_table = gtk_table_new(1, 2, TRUE);
- gtk_box_pack_end(GTK_BOX(fi->hbox), fi->button_table, FALSE, TRUE, 3);
+ fi->button_table = gtk_table_new(1, 2, FALSE);
+ gtk_box_pack_end(GTK_BOX(fi->hbox), fi->button_table, FALSE, TRUE, 2);
- dismiss_btn = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ fi->prev_button = gui_stock_label_button(NULL, GTK_STOCK_GO_BACK);
+ g_signal_connect(fi->prev_button, "clicked",
+ G_CALLBACK(fi_prev), (gpointer)fi);
+ gtk_table_attach(GTK_TABLE(fi->button_table), fi->prev_button,
+ 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
+
+ fi->next_button = gui_stock_label_button(NULL, GTK_STOCK_GO_FORWARD);
+ g_signal_connect(fi->next_button, "clicked",
+ G_CALLBACK(fi_next), (gpointer)fi);
+ gtk_table_attach(GTK_TABLE(fi->button_table), fi->next_button,
+ 2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 0);
+
+ dismiss_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(dismiss_btn, "clicked", G_CALLBACK(dismiss), (gpointer)fi);
- gtk_table_attach(GTK_TABLE(fi->button_table), dismiss_btn, 1, 2, 0, 1,
- GTK_FILL, GTK_FILL, 5, 3);
+ gtk_table_attach(GTK_TABLE(fi->button_table), dismiss_btn, 3, 4, 0, 1,
+ GTK_FILL, GTK_FILL, 3, 0);
gtk_widget_show_all(fi->info_window);
Modified: trunk/src/file_info.h
===================================================================
--- trunk/src/file_info.h 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/file_info.h 2014-05-04 22:06:57 UTC (rev 1293)
@@ -24,9 +24,16 @@
#include <glib.h>
#include <gtk/gtk.h>
+/* Since we want to use the fileinfo dialog over different models, the
+ * caller must provide us a function to access relevant fields of its
+ * tree model.
+ * Returns TRUE if successful (name and file points to valid data).
+ */
+typedef gboolean (*fileinfo_model_func_t)(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file);
-void show_file_info(char * name, char * file, int is_called_from_browser,
- GtkTreeModel * model, GtkTreeIter iter_track, gboolean cover_flag);
+void show_file_info(GtkTreeModel * model, GtkTreeIter iter_track,
+ fileinfo_model_func_t fi_mfun, int mindepth,
+ gboolean allow_ms_import, gboolean cover_flag);
#endif /* AQUALUNG_FILE_INFO_H */
Modified: trunk/src/gui_main.c
===================================================================
--- trunk/src/gui_main.c 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/gui_main.c 2014-05-04 22:06:57 UTC (rev 1293)
@@ -904,13 +904,21 @@
void
conf__fileinfo_cb(gpointer data) {
+ playlist_t * pl;
+ GtkTreePath * p;
+ GtkTreeIter iter;
+
if (is_file_loaded) {
-
- GtkTreeIter dummy;
- const char * name = gtk_label_get_text(GTK_LABEL(label_title));
-
- show_file_info((char *)name, current_file, 0, NULL, dummy, TRUE);
+ pl = playlist_get_playing();
+ } else {
+ pl = playlist_get_current();
}
+ if (pl == NULL) return;
+ p = playlist_get_playing_path(pl);
+ if (p == NULL) return;
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(pl->store), &iter, p);
+ gtk_tree_path_free(p);
+ show_file_info(GTK_TREE_MODEL(pl->store), iter, playlist_model_func, 0, FALSE, TRUE);
}
@@ -1146,11 +1154,12 @@
return TRUE;
case GDK_i:
case GDK_I:
- if (!options.playlist_is_embedded) {
- conf__fileinfo_cb(NULL);
- return TRUE;
- }
- break;
+ if (options.playlist_is_embedded) {
+ return playlist_window_key_pressed(widget, event);
+ } else {
+ conf__fileinfo_cb(NULL);
+ }
+ break;
case GDK_BackSpace:
if (allow_seeks && total_samples != 0) {
seek_t seek;
@@ -1375,34 +1384,21 @@
gint
-main_window_button_pressed(GtkWidget * widget, GdkEventButton * event) {
+main_window_button_pressed(GtkWidget * widget, GdkEventButton * event, gpointer data) {
if (event->button == 3) {
-
- GtkWidget * fileinfo;
-
if (options.playlist_is_embedded) {
- fileinfo = plist__fileinfo;
- } else {
- fileinfo = conf__fileinfo;
- }
-
- if (is_file_loaded && (current_file[0] != '\0')) {
-
- const char * name = gtk_label_get_text(GTK_LABEL(label_title));
-
- strncpy(fileinfo_name, name, MAXLEN-1);
- strncpy(fileinfo_file, current_file, MAXLEN-1);
-
- gtk_widget_set_sensitive(fileinfo, TRUE);
- } else {
- gtk_widget_set_sensitive(fileinfo, FALSE);
- }
-
- if (options.playlist_is_embedded) {
- playlist_menu_set_popup_sensitivity(playlist_get_current());
+ /* translate and crop event coordinates over playlist widget */
+ event->x -= playlist_window->allocation.x;
+ if (event->x > playlist_window->allocation.width) {
+ event->x = -1;
+ }
+ event->y -= playlist_window->allocation.y;
+ if (event->y > playlist_window->allocation.height) {
+ event->y = -1;
+ }
+ return playlist_window_button_pressed(widget, event, playlist_get_current());
}
-
gtk_menu_popup(GTK_MENU(conf_menu), NULL, NULL, NULL, NULL,
event->button, event->time);
}
@@ -2807,7 +2803,7 @@
if (!options.playlist_is_embedded) {
gtk_menu_shell_append(GTK_MENU_SHELL(conf_menu), conf__fileinfo);
gtk_menu_shell_append(GTK_MENU_SHELL(conf_menu), conf__separator1);
- }
+ }
gtk_menu_shell_append(GTK_MENU_SHELL(conf_menu), conf__about);
gtk_menu_shell_append(GTK_MENU_SHELL(conf_menu), conf__separator2);
gtk_menu_shell_append(GTK_MENU_SHELL(conf_menu), conf__quit);
@@ -2819,9 +2815,8 @@
if (!options.playlist_is_embedded) {
g_signal_connect_swapped(G_OBJECT(conf__fileinfo), "activate", G_CALLBACK(conf__fileinfo_cb), NULL);
- gtk_widget_set_sensitive(conf__fileinfo, FALSE);
gtk_widget_show(conf__fileinfo);
- }
+ }
gtk_widget_show(conf__options);
if (!options.disable_skin_support_settings) {
@@ -3793,10 +3788,6 @@
/* set timeout function */
timeout_tag = aqualung_timeout_add(TIMEOUT_PERIOD, timeout_callback, NULL);
- if (options.playlist_is_embedded) {
- gtk_widget_set_sensitive(plist__fileinfo, FALSE);
- }
-
/* re-apply skin to override possible WM theme */
if (!options.disable_skin_support_settings) {
apply_skin(options.skin);
Modified: trunk/src/playlist.c
===================================================================
--- trunk/src/playlist.c 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/playlist.c 2014-05-04 22:06:57 UTC (rev 1293)
@@ -136,9 +136,7 @@
gchar command[RB_CONTROL_SIZE];
-gchar fileinfo_name[MAXLEN];
-gchar fileinfo_file[MAXLEN];
-int fileinfo_cover;
+GtkTreeIter * fileinfo_iter = NULL;
int playlist_dirty;
int playlist_auto_save_tag = -1;
@@ -1294,17 +1292,10 @@
if (path &&
gtk_tree_model_get_iter(GTK_TREE_MODEL(pl->store), &iter, path) &&
!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(pl->store), &iter)) {
-
- GtkTreeIter dummy;
playlist_data_t * data;
-
gtk_tree_model_get(GTK_TREE_MODEL(pl->store), &iter, PL_COL_DATA, &data, -1);
-
- playlist_data_get_display_name(fileinfo_name, data);
- strncpy(fileinfo_file, data->file, MAXLEN-1);
- fileinfo_cover = IS_PL_COVER(data);
-
- show_file_info(fileinfo_name, fileinfo_file, 0, NULL, dummy, fileinfo_cover);
+ show_file_info(GTK_TREE_MODEL(pl->store), iter, playlist_model_func,
+ 0, FALSE, IS_PL_COVER(data));
}
if (path) {
@@ -1507,7 +1498,7 @@
}
gint
-doubleclick_handler(GtkWidget * widget, GdkEventButton * event, gpointer data) {
+playlist_window_button_pressed(GtkWidget * widget, GdkEventButton * event, gpointer data) {
GtkTreePath * path;
GtkTreeIter iter;
@@ -1527,26 +1518,17 @@
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(pl->view), event->x, event->y,
&path, NULL, NULL, NULL) &&
gtk_tree_model_get_iter(GTK_TREE_MODEL(pl->store), &iter, path)) {
-
if (gtk_tree_selection_count_selected_rows(pl->select) == 0) {
gtk_tree_view_set_cursor(GTK_TREE_VIEW(pl->view), path, NULL, FALSE);
}
-
if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(pl->store), &iter)) {
gtk_widget_set_sensitive(plist__fileinfo, FALSE);
} else {
- playlist_data_t * data;
-
gtk_widget_set_sensitive(plist__fileinfo, TRUE);
-
- gtk_tree_model_get(GTK_TREE_MODEL(pl->store), &iter, PL_COL_DATA, &data, -1);
-
- playlist_data_get_display_name(fileinfo_name, data);
- strncpy(fileinfo_file, data->file, MAXLEN-1);
- fileinfo_cover = IS_PL_COVER(data);
+ fileinfo_iter = gtk_tree_iter_copy(&iter);
}
} else {
- gtk_widget_set_sensitive(plist__fileinfo, FALSE);
+ gtk_widget_set_sensitive(plist__fileinfo, TRUE);
}
playlist_menu_set_popup_sensitivity(pl);
@@ -2581,8 +2563,24 @@
void
plist__fileinfo_cb(gpointer user_data) {
- GtkTreeIter dummy;
- show_file_info(fileinfo_name, fileinfo_file, 0, NULL, dummy, fileinfo_cover);
+ playlist_t * pl = playlist_get_current();
+ playlist_data_t * pldata;
+ GtkTreeIter iter;
+
+ if (!pl) return;
+ if (fileinfo_iter) {
+ gtk_tree_model_get(GTK_TREE_MODEL(pl->store), fileinfo_iter, PL_COL_DATA, &pldata, -1);
+ iter = *fileinfo_iter;
+ gtk_tree_iter_free(fileinfo_iter);
+ fileinfo_iter = NULL; // mark it as consumed
+ } else {
+ GtkTreePath * p = playlist_get_playing_path(pl);
+ if (p == NULL) return;
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(pl->store), &iter, p);
+ gtk_tree_path_free(p);
+ }
+ show_file_info(GTK_TREE_MODEL(pl->store), iter, playlist_model_func, 0,
+ FALSE, IS_PL_COVER(pldata));
}
void
@@ -4032,7 +4030,7 @@
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(pl->view), FALSE);
g_signal_connect(G_OBJECT(pl->view), "button_press_event",
- G_CALLBACK(doubleclick_handler), pl);
+ G_CALLBACK(playlist_window_button_pressed), pl);
/* setup drag and drop */
@@ -5873,5 +5871,15 @@
gtk_tree_path_free(active_path);
}
+/* passed as fileinfo_model_func_t argument to show_file_info */
+gboolean
+playlist_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file) {
+ playlist_data_t * data;
+ gtk_tree_model_get(model, &iter, PL_COL_NAME, name, -1);
+ gtk_tree_model_get(model, &iter, PL_COL_DATA, &data, -1);
+ *file = strdup(data->file);
+ return TRUE;
+}
+
// vim: shiftwidth=8:tabstop=8:softtabstop=8 :
Modified: trunk/src/playlist.h
===================================================================
--- trunk/src/playlist.h 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/playlist.h 2014-05-04 22:06:57 UTC (rev 1293)
@@ -155,6 +155,9 @@
void playlist_remove_cdda(char * device_path);
#endif /* HAVE_CDDA */
+gint playlist_window_button_pressed(GtkWidget * widget, GdkEventButton * event, gpointer data);
+gboolean playlist_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file);
+
enum {
PL_FLAG_ACTIVE = (1 << 0),
PL_FLAG_COVER = (1 << 1),
Modified: trunk/src/store_file.c
===================================================================
--- trunk/src/store_file.c 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/store_file.c 2014-05-04 22:06:57 UTC (rev 1293)
@@ -224,6 +224,7 @@
void track__fileinfo_cb(gpointer data);
+static gboolean store_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file);
struct keybinds store_keybinds[] = {
{store__addlist_defmode, GDK_a, GDK_A, 0},
@@ -2679,50 +2680,12 @@
void
track__fileinfo_cb(gpointer user_data) {
+ GtkTreeModel * model;
GtkTreeIter iter_track;
- GtkTreeIter iter_record;
- GtkTreeIter iter_artist;
- GtkTreeModel * model;
- track_data_t * data;
-
- char * ptrack_name;
- char * precord_name;
- char * partist_name;
-
- char track_name[MAXLEN];
- char record_name[MAXLEN];
- char artist_name[MAXLEN];
-
- char list_str[MAXLEN];
-
if (gtk_tree_selection_get_selected(music_select, &model, &iter_track)) {
-
- gtk_tree_model_get(model, &iter_track,
- MS_COL_NAME, &ptrack_name,
- MS_COL_DATA, &data, -1);
-
- strncpy(track_name, ptrack_name, MAXLEN-1);
- g_free(ptrack_name);
-
- gtk_tree_model_iter_parent(model, &iter_record, &iter_track);
- gtk_tree_model_get(model, &iter_record, MS_COL_NAME, &precord_name, -1);
- strncpy(record_name, precord_name, MAXLEN-1);
- g_free(precord_name);
-
- gtk_tree_model_iter_parent(model, &iter_artist, &iter_record);
- gtk_tree_model_get(model, &iter_artist, MS_COL_NAME, &partist_name, -1);
- strncpy(artist_name, partist_name, MAXLEN-1);
- g_free(partist_name);
-
- make_title_string(list_str, options.title_format,
- artist_name, record_name, track_name);
-
- if (is_store_iter_readonly(&iter_track)) {
- show_file_info(list_str, data->file, 0, model, iter_track, TRUE);
- } else {
- show_file_info(list_str, data->file, 1, model, iter_track, TRUE);
- }
+ show_file_info(model, iter_track, store_model_func, 1,
+ is_store_iter_readonly(&iter_track), TRUE);
}
}
@@ -4923,5 +4886,29 @@
}
}
+/* passed as fileinfo_model_func_t argument to show_file_info */
+static gboolean
+store_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file) {
+ char * artist_name;
+ char * record_name;
+ char * track_name;
+ track_data_t * data;
+ GtkTreeIter iter_record;
+ GtkTreeIter iter_artist;
+ char buf[MAXLEN];
+
+ gtk_tree_model_get(model, &iter, MS_COL_NAME, &track_name, MS_COL_DATA, &data, -1);
+ gtk_tree_model_iter_parent(model, &iter_record, &iter);
+ gtk_tree_model_get(model, &iter_record, MS_COL_NAME, &record_name, -1);
+ gtk_tree_model_iter_parent(model, &iter_artist, &iter_record);
+ gtk_tree_model_get(model, &iter_artist, MS_COL_NAME, &artist_name, -1);
+
+ make_title_string(buf, options.title_format, artist_name, record_name, track_name);
+
+ *name = strndup(buf, MAXLEN-1);
+ *file = strdup(data->file);
+ return TRUE;
+}
+
// vim: shiftwidth=8:tabstop=8:softtabstop=8 :
Modified: trunk/src/store_podcast.c
===================================================================
--- trunk/src/store_podcast.c 2014-05-02 12:29:01 UTC (rev 1292)
+++ trunk/src/store_podcast.c 2014-05-04 22:06:57 UTC (rev 1293)
@@ -115,6 +115,8 @@
void podcast_track__export_cb(gpointer data);
#endif /* HAVE_TRANSCODING */
+static gboolean store_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file);
+
struct keybinds podcast_store_keybinds[] = {
{podcast_store__addlist_defmode, GDK_a, GDK_A, 0},
{podcast_store__update_cb, GDK_u, GDK_U, 0},
@@ -581,24 +583,10 @@
podcast_track__fileinfo_cb(gpointer data) {
GtkTreeIter iter_track;
- GtkTreeIter pod_iter;
GtkTreeModel * model;
- char list_str[MAXLEN];
-
if (gtk_tree_selection_get_selected(music_select, &model, &iter_track)) {
-
- podcast_item_t * item;
- podcast_t * podcast;
-
- gtk_tree_model_get(GTK_TREE_MODEL(music_store), &iter_track, MS_COL_DATA, &item, -1);
-
- gtk_tree_model_iter_parent(GTK_TREE_MODEL(music_store), &pod_iter, &iter_track);
- gtk_tree_model_get(GTK_TREE_MODEL(music_store), &pod_iter, MS_COL_DATA, &podcast, -1);
-
- make_title_string(list_str, options.title_format, podcast->author, podcast->title, item->title);
-
- show_file_info(list_str, item->file, 0, model, iter_track, TRUE);
+ show_file_info(model, iter_track, store_model_func, 1, FALSE, TRUE);
}
}
@@ -2148,5 +2136,24 @@
xmlFreeDoc(doc);
}
+/* passed as fileinfo_model_func_t argument to show_file_info */
+static gboolean
+store_model_func(GtkTreeModel * model, GtkTreeIter iter, char**name, char**file) {
+ podcast_item_t * item;
+ podcast_t * podcast;
+ GtkTreeIter pod_iter;
+ char buf[MAXLEN];
+
+ gtk_tree_model_get(model, &iter, MS_COL_DATA, &item, -1);
+ gtk_tree_model_iter_parent(model, &pod_iter, &iter);
+ gtk_tree_model_get(model, &pod_iter, MS_COL_DATA, &podcast, -1);
+ make_title_string(buf, options.title_format, podcast->author, podcast->title, item->title);
+
+ *name = strndup(buf, MAXLEN-1);
+ *file = strdup(item->file);
+
+ return TRUE;
+}
+
// vim: shiftwidth=8:tabstop=8:softtabstop=8 :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-02 12:29:04
|
Revision: 1292
http://sourceforge.net/p/aqualung/code/1292
Author: tszilagyi
Date: 2014-05-02 12:29:01 +0000 (Fri, 02 May 2014)
Log Message:
-----------
Merge branch 'b141_not_so_modal_dialogs'
Modified Paths:
--------------
trunk/src/about.c
trunk/src/cover.c
trunk/src/export.c
trunk/src/export.h
trunk/src/file_info.c
trunk/src/ifp_device.c
trunk/src/options.c
trunk/src/playlist.c
trunk/src/search.c
trunk/src/search_playlist.c
trunk/src/store_cdda.c
trunk/src/store_file.c
trunk/src/store_podcast.c
trunk/src/utils_gui.c
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/about.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -287,7 +287,6 @@
about_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_transient_for(GTK_WINDOW(about_window), GTK_WINDOW(main_window));
- gtk_window_set_modal(GTK_WINDOW(about_window), TRUE);
gtk_widget_set_name(about_window, "");
gtk_window_set_title(GTK_WINDOW(about_window), _("About"));
gtk_widget_set_size_request(about_window, 483, 430);
Modified: trunk/src/cover.c
===================================================================
--- trunk/src/cover.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/cover.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -298,7 +298,6 @@
G_CALLBACK(cover_window_key_pressed), NULL);
gtk_window_set_position(GTK_WINDOW(cover_window), GTK_WIN_POS_MOUSE);
gtk_widget_set_events(cover_window, GDK_BUTTON_PRESS_MASK);
- gtk_window_set_modal(GTK_WINDOW(cover_window), TRUE);
gtk_window_set_transient_for(GTK_WINDOW(cover_window), GTK_WINDOW(window));
gtk_window_set_decorated(GTK_WINDOW(cover_window), FALSE);
Modified: trunk/src/export.c
===================================================================
--- trunk/src/export.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/export.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -49,7 +49,7 @@
#define BUFSIZE 10240
-extern GtkWidget * browser_window;
+extern GtkWidget * main_window;
extern options_t options;
GtkWidget * export_window;
@@ -723,7 +723,7 @@
export_browse_cb(GtkButton * button, gpointer data) {
file_chooser_with_entry(_("Please select the directory for exported files."),
- browser_window,
+ main_window,
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
FILE_CHOOSER_FILTER_NONE,
(GtkWidget *)data,
@@ -919,36 +919,211 @@
gtk_widget_set_sensitive((GtkWidget *)data, state);
}
-int
-export_dialog(export_t * export) {
+gboolean
+export_window_event(GtkWidget * widget, GdkEvent * event, gpointer * data) {
+ if (event->type == GDK_DELETE) {
+ gtk_window_iconify(GTK_WINDOW(export_window));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+void
+export_cancel_event(GtkButton * button, gpointer data) {
+
+ export_t * export = (export_t *)data;
+
+ export->cancelled = 1;
+}
+
+void
+create_export_window() {
+
+ GtkWidget * vbox;
+
+ export_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ register_toplevel_window(export_window, TOP_WIN_SKIN | TOP_WIN_TRAY);
+ gtk_window_set_title(GTK_WINDOW(export_window), _("Exporting files"));
+ gtk_window_set_position(GTK_WINDOW(export_window), GTK_WIN_POS_CENTER);
+ gtk_window_set_transient_for(GTK_WINDOW(export_window), GTK_WINDOW(main_window));
+ gtk_window_set_type_hint(GTK_WINDOW(export_window), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+ gtk_window_resize(GTK_WINDOW(export_window), 480, 110);
+ g_signal_connect(G_OBJECT(export_window), "event",
+ G_CALLBACK(export_window_event), NULL);
+
+ gtk_container_set_border_width(GTK_CONTAINER(export_window), 5);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(export_window), vbox);
+
+ gtk_widget_show_all(export_window);
+}
+
+void
+export_progress_window(export_t * export) {
+
+ GtkWidget * vbox;
+
+ ++export_slot_count;
+
+ if (export_window == NULL) {
+ create_export_window();
+ }
+
+ vbox = gtk_bin_get_child(GTK_BIN(export_window));
+
+ export->slot = gtk_table_new(5, 2, FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), export->slot, FALSE, FALSE, 0);
+
+ gtk_table_attach(GTK_TABLE(export->slot), gtk_hseparator_new(), 0, 2, 0, 1,
+ GTK_FILL, GTK_FILL, 5, 5);
+
+ insert_label_entry(export->slot, _("Source file:"), &export->prog_file_entry1, NULL, 1, 2, FALSE);
+ insert_label_entry(export->slot, _("Target file:"), &export->prog_file_entry2, NULL, 2, 3, FALSE);
+
+ export->prog_cancel_button = gui_stock_label_button(_("Abort"), GTK_STOCK_CANCEL);
+ g_signal_connect(export->prog_cancel_button, "clicked", G_CALLBACK(export_cancel_event), export);
+ insert_label_progbar_button(export->slot, _("Progress:"), &export->progbar, export->prog_cancel_button, 3, 4);
+
+ gtk_table_attach(GTK_TABLE(export->slot), gtk_hseparator_new(), 0, 2, 4, 5,
+ GTK_FILL, GTK_FILL, 5, 5);
+
+ gtk_widget_grab_focus(export->prog_cancel_button);
+
+ gtk_widget_show_all(export->slot);
+}
+
+gboolean
+export_dialog_close(GtkWidget * widget, GdkEvent * event, gpointer ex) {
+ export_t * export = ex;
+ gtk_widget_destroy(export->dialog);
+ return TRUE;
+}
+
+gboolean
+export_dialog_response(GtkDialog * dialog, gint response_id, gpointer ex) {
+ export_t * export = ex;
+ char * poutdir = g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(export->outdir_entry)), -1, NULL, NULL, NULL);
+
+ if (response_id != GTK_RESPONSE_ACCEPT) {
+ gtk_widget_destroy(export->dialog);
+ return TRUE;
+ }
+
+ if ((poutdir == NULL) || (poutdir[0] == '\0')) {
+ gtk_widget_grab_focus(export->outdir_entry);
+ g_free(poutdir);
+ return FALSE;
+ }
+
+ normalize_filename(poutdir, export->outdir);
+ g_free(poutdir);
+
+ if (strlen(gtk_entry_get_text(GTK_ENTRY(export->templ_entry))) == 0) {
+ gtk_widget_grab_focus(export->templ_entry);
+ return FALSE;
+ } else {
+ int ret;
+ char buf[MAXLEN];
+ char * format = (char *)gtk_entry_get_text(GTK_ENTRY(export->templ_entry));
+ if ((ret = make_string_va(buf, format,
+ 'o', "o", 'a', "a", 'r', "r", 't', "t", 'n', "n", 'x', "x", 'i', "i", 0)) != 0) {
+ make_string_strerror(ret, buf);
+ message_dialog(_("Error in format string"),
+ export->dialog,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ NULL,
+ buf);
+ return FALSE;
+ }
+ }
+
+ if (access(export->outdir, R_OK | W_OK) != 0) {
+ message_dialog(_("Error"),
+ export->dialog,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ NULL,
+ _("\nDestination directory is not read-write accessible!"));
+
+ gtk_widget_grab_focus(export->outdir_entry);
+ return FALSE;
+ }
+
+ strncpy(options.exportdir, export->outdir, MAXLEN-1);
+ set_option_from_entry(export->templ_entry, export->template, MAXLEN);
+ set_option_from_entry(export->templ_entry, options.export_template, MAXLEN);
+ options.export_file_format = export->format = export_get_format_from_combo(export->format_combo);
+ options.export_bitrate = export->bitrate = gtk_range_get_value(GTK_RANGE(export->bitrate_scale));
+ set_option_from_toggle(export->check_dir_artist, &options.export_subdir_artist);
+ set_option_from_toggle(export->check_dir_album, &options.export_subdir_album);
+ set_option_from_spin(export->dirlen_spin, &options.export_subdir_limit);
+ set_option_from_toggle(export->vbr_check, &export->vbr);
+ options.export_vbr = export->vbr;
+ set_option_from_toggle(export->meta_check, &export->write_meta);
+ options.export_metadata = export->write_meta;
+ set_option_from_toggle(export->check_dir_artist, &export->dir_for_artist);
+ set_option_from_toggle(export->check_dir_album, &export->dir_for_album);
+
+ set_option_from_toggle(export->check_filter_same, &export->filter_same);
+ options.export_filter_same = export->filter_same;
+ set_option_from_toggle(export->check_excl_enabled, &export->excl_enabled);
+ options.export_excl_enabled = export->excl_enabled;
+
+ if (export->excl_enabled) {
+ set_option_from_entry(export->excl_entry, options.export_excl_pattern, MAXLEN);
+ export->excl_patternv =
+ g_strsplit(gtk_entry_get_text(GTK_ENTRY(export->excl_entry)), ",", 0);
+ }
+
+ if (export->dir_for_artist || export->dir_for_album) {
+ set_option_from_spin(export->dirlen_spin, &export->dir_len_limit);
+ } else {
+ export->dir_len_limit = MAXLEN-1;
+ }
+
+ gtk_widget_destroy(export->dialog);
+
+ export_progress_window(export);
+ export->progbar_tag = aqualung_timeout_add(250, update_progbar_ratio, export);
+ AQUALUNG_THREAD_CREATE(export->thread_id, NULL, export_thread, export);
+
+ return TRUE;
+}
+
+void
+export_start(export_t * export) {
+
GtkWidget * content_area;
GtkWidget * help_button;
- GtkWidget * outdir_entry;
- GtkWidget * templ_entry;
GtkWidget * table;
GtkWidget * hbox;
GtkWidget * frame;
- GtkWidget * check_filter_same;
- GtkWidget * check_excl_enabled;
- GtkWidget * excl_entry;
-
export->dialog = gtk_dialog_new_with_buttons(_("Export files"),
- GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- NULL);
+ GTK_WINDOW(main_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ NULL);
gtk_window_set_position(GTK_WINDOW(export->dialog), GTK_WIN_POS_CENTER);
gtk_window_set_default_size(GTK_WINDOW(export->dialog), 400, -1);
gtk_dialog_set_default_response(GTK_DIALOG(export->dialog), GTK_RESPONSE_REJECT);
-
+
content_area = gtk_dialog_get_content_area(GTK_DIALOG(export->dialog));
+ g_signal_connect(G_OBJECT(export->dialog), "response",
+ G_CALLBACK(export_dialog_response), (gpointer)export);
+ g_signal_connect(G_OBJECT(export->dialog), "delete_event",
+ G_CALLBACK(export_dialog_close), (gpointer)export);
+
/* Location and filename */
frame = gtk_frame_new(_("Location and filename"));
gtk_box_pack_start(GTK_BOX(content_area), frame, FALSE, FALSE, 2);
@@ -957,7 +1132,7 @@
table = gtk_table_new(5, 2, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table);
- insert_label_entry_browse(table, _("Target directory:"), &outdir_entry, options.exportdir, 0, 1, export_browse_cb);
+ insert_label_entry_browse(table, _("Target directory:"), &export->outdir_entry, options.exportdir, 0, 1, export_browse_cb);
export->check_dir_artist = gtk_check_button_new_with_label(_("Create subdirectories for artists"));
gtk_widget_set_name(export->check_dir_artist, "check_on_notebook");
@@ -978,30 +1153,30 @@
help_button = gtk_button_new_from_stock(GTK_STOCK_HELP);
g_signal_connect(help_button, "clicked", G_CALLBACK(export_format_help_cb), export);
- insert_label_entry_button(table, _("Filename template:"), &templ_entry, options.export_template, help_button, 4, 5);
+ insert_label_entry_button(table, _("Filename template:"), &export->templ_entry, options.export_template, help_button, 4, 5);
/* Format */
frame = gtk_frame_new(_("Format"));
gtk_box_pack_start(GTK_BOX(content_area), frame, FALSE, FALSE, 2);
gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
- table = gtk_table_new(4, 2, TRUE);
+ table = gtk_table_new(4, 2, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table);
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("File format:")), FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 4);
+ gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 5);
export->format_combo = export_create_format_combo();
g_signal_connect(G_OBJECT(export->format_combo), "changed",
G_CALLBACK(export_format_combo_changed), export);
gtk_table_attach(GTK_TABLE(table), export->format_combo, 1, 2, 0, 1,
- GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 2);
+ GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 5);
hbox = gtk_hbox_new(FALSE, 0);
export->bitrate_label = gtk_label_new(_("Compression level:"));
gtk_box_pack_start(GTK_BOX(hbox), export->bitrate_label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 0);
+ gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
export->bitrate_scale = gtk_hscale_new_with_range(0, 8, 1);
g_signal_connect(G_OBJECT(export->bitrate_scale), "value-changed",
@@ -1010,21 +1185,21 @@
gtk_scale_set_digits(GTK_SCALE(export->bitrate_scale), 0);
gtk_widget_set_size_request(export->bitrate_scale, 180, -1);
gtk_table_attach(GTK_TABLE(table), export->bitrate_scale, 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 0);
+ GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 5);
export->bitrate_value_label = gtk_label_new("0 (fast)");
gtk_table_attach(GTK_TABLE(table), export->bitrate_value_label, 1, 2, 2, 3,
- GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 0);
+ GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 5);
export->vbr_check = gtk_check_button_new_with_label(_("VBR encoding"));
gtk_widget_set_name(export->vbr_check, "check_on_notebook");
- gtk_table_attach(GTK_TABLE(table), export->vbr_check, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 5, 0);
+ gtk_table_attach(GTK_TABLE(table), export->vbr_check, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 5, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(export->vbr_check), options.export_vbr);
export->meta_check = gtk_check_button_new_with_label(_("Tag files with metadata"));
gtk_widget_set_name(export->meta_check, "check_on_notebook");
gtk_table_attach(GTK_TABLE(table), export->meta_check, 0, 2, 3, 4,
- GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 4);
+ GTK_FILL, GTK_FILL, 5, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(export->meta_check), options.export_metadata);
@@ -1036,206 +1211,32 @@
table = gtk_table_new(1, 2, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table);
- check_filter_same = gtk_check_button_new_with_label(_("Do not reencode files already being in the target format"));
- gtk_widget_set_name(check_filter_same, "check_on_notebook");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_filter_same), options.export_filter_same);
- gtk_table_attach(GTK_TABLE(table), check_filter_same, 0, 2, 0, 1, GTK_FILL, GTK_FILL, 5, 5);
+ export->check_filter_same = gtk_check_button_new_with_label(_("Do not reencode files already being in the target format"));
+ gtk_widget_set_name(export->check_filter_same, "check_on_notebook");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(export->check_filter_same), options.export_filter_same);
+ gtk_table_attach(GTK_TABLE(table), export->check_filter_same, 0, 2, 0, 1, GTK_FILL, GTK_FILL, 5, 5);
- check_excl_enabled = gtk_check_button_new_with_label(_("Do not reencode files\nmatching wildcard:"));
- gtk_widget_set_name(check_excl_enabled, "check_on_notebook");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_excl_enabled), options.export_excl_enabled);
- gtk_table_attach(GTK_TABLE(table), check_excl_enabled, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
+ export->check_excl_enabled = gtk_check_button_new_with_label(_("Do not reencode files\nmatching wildcard:"));
+ gtk_widget_set_name(export->check_excl_enabled, "check_on_notebook");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(export->check_excl_enabled), options.export_excl_enabled);
+ gtk_table_attach(GTK_TABLE(table), export->check_excl_enabled, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
- excl_entry = gtk_entry_new();
- gtk_entry_set_max_length(GTK_ENTRY(excl_entry), MAXLEN-1);
- gtk_entry_set_text(GTK_ENTRY(excl_entry), options.export_excl_pattern);
- gtk_table_attach(GTK_TABLE(table), excl_entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
- gtk_widget_set_sensitive(excl_entry, options.export_excl_enabled);
+ export->excl_entry = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(export->excl_entry), MAXLEN-1);
+ gtk_entry_set_text(GTK_ENTRY(export->excl_entry), options.export_excl_pattern);
+ gtk_table_attach(GTK_TABLE(table), export->excl_entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 5);
+ gtk_widget_set_sensitive(export->excl_entry, options.export_excl_enabled);
- g_signal_connect(G_OBJECT(check_excl_enabled), "toggled",
- G_CALLBACK(export_check_excl_toggled), excl_entry);
+ g_signal_connect(G_OBJECT(export->check_excl_enabled), "toggled",
+ G_CALLBACK(export_check_excl_toggled), export->excl_entry);
gtk_widget_show_all(export->dialog);
export_format_combo_changed(export->format_combo, export);
- display:
-
export->outdir[0] = '\0';
- if (aqualung_dialog_run(GTK_DIALOG(export->dialog)) == GTK_RESPONSE_ACCEPT) {
-
- char * poutdir = g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(outdir_entry)), -1, NULL, NULL, NULL);
-
- if ((poutdir == NULL) || (poutdir[0] == '\0')) {
- gtk_widget_grab_focus(outdir_entry);
- g_free(poutdir);
- goto display;
- }
-
- normalize_filename(poutdir, export->outdir);
- g_free(poutdir);
-
- if (strlen(gtk_entry_get_text(GTK_ENTRY(templ_entry))) == 0) {
- gtk_widget_grab_focus(templ_entry);
- goto display;
- } else {
- int ret;
- char buf[MAXLEN];
- char * format = (char *)gtk_entry_get_text(GTK_ENTRY(templ_entry));
- if ((ret = make_string_va(buf, format,
- 'o', "o", 'a', "a", 'r', "r", 't', "t", 'n', "n", 'x', "x", 'i', "i", 0)) != 0) {
- make_string_strerror(ret, buf);
- message_dialog(_("Error in format string"),
- export->dialog,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- NULL,
- buf);
- goto display;
- }
- }
-
- if (access(export->outdir, R_OK | W_OK) != 0) {
- message_dialog(_("Error"),
- export->dialog,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- NULL,
- _("\nDestination directory is not read-write accessible!"));
-
- gtk_widget_grab_focus(outdir_entry);
- goto display;
- }
-
- strncpy(options.exportdir, export->outdir, MAXLEN-1);
- set_option_from_entry(templ_entry, export->template, MAXLEN);
- set_option_from_entry(templ_entry, options.export_template, MAXLEN);
- options.export_file_format = export->format = export_get_format_from_combo(export->format_combo);
- options.export_bitrate = export->bitrate = gtk_range_get_value(GTK_RANGE(export->bitrate_scale));
- set_option_from_toggle(export->check_dir_artist, &options.export_subdir_artist);
- set_option_from_toggle(export->check_dir_album, &options.export_subdir_album);
- set_option_from_spin(export->dirlen_spin, &options.export_subdir_limit);
- set_option_from_toggle(export->vbr_check, &export->vbr);
- options.export_vbr = export->vbr;
- set_option_from_toggle(export->meta_check, &export->write_meta);
- options.export_metadata = export->write_meta;
- set_option_from_toggle(export->check_dir_artist, &export->dir_for_artist);
- set_option_from_toggle(export->check_dir_album, &export->dir_for_album);
-
- set_option_from_toggle(check_filter_same, &export->filter_same);
- options.export_filter_same = export->filter_same;
- set_option_from_toggle(check_excl_enabled, &export->excl_enabled);
- options.export_excl_enabled = export->excl_enabled;
-
- if (export->excl_enabled) {
- set_option_from_entry(excl_entry, options.export_excl_pattern, MAXLEN);
- export->excl_patternv =
- g_strsplit(gtk_entry_get_text(GTK_ENTRY(excl_entry)), ",", 0);
- }
-
- if (export->dir_for_artist || export->dir_for_album) {
- set_option_from_spin(export->dirlen_spin, &export->dir_len_limit);
- } else {
- export->dir_len_limit = MAXLEN-1;
- }
-
- gtk_widget_destroy(export->dialog);
- return 1;
- } else {
- gtk_widget_destroy(export->dialog);
- return 0;
- }
+ return;
}
-gboolean
-export_window_event(GtkWidget * widget, GdkEvent * event, gpointer * data) {
-
- if (event->type == GDK_DELETE) {
- gtk_window_iconify(GTK_WINDOW(export_window));
- return TRUE;
- }
-
- return FALSE;
-}
-
-void
-export_cancel_event(GtkButton * button, gpointer data) {
-
- export_t * export = (export_t *)data;
-
- export->cancelled = 1;
-}
-
-void
-create_export_window() {
-
- GtkWidget * vbox;
-
- export_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- register_toplevel_window(export_window, TOP_WIN_SKIN | TOP_WIN_TRAY);
- gtk_window_set_title(GTK_WINDOW(export_window), _("Exporting files"));
- gtk_window_set_position(GTK_WINDOW(export_window), GTK_WIN_POS_CENTER);
- gtk_window_resize(GTK_WINDOW(export_window), 480, 110);
- g_signal_connect(G_OBJECT(export_window), "event",
- G_CALLBACK(export_window_event), NULL);
-
- gtk_container_set_border_width(GTK_CONTAINER(export_window), 5);
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(export_window), vbox);
-
- gtk_widget_show_all(export_window);
-}
-
-void
-export_progress_window(export_t * export) {
-
- GtkWidget * vbox;
-
- ++export_slot_count;
-
- if (export_window == NULL) {
- create_export_window();
- }
-
- vbox = gtk_bin_get_child(GTK_BIN(export_window));
-
- export->slot = gtk_table_new(5, 2, FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), export->slot, FALSE, FALSE, 0);
-
- gtk_table_attach(GTK_TABLE(export->slot), gtk_hseparator_new(), 0, 2, 0, 1,
- GTK_FILL, GTK_FILL, 5, 5);
-
- insert_label_entry(export->slot, _("Source file:"), &export->prog_file_entry1, NULL, 1, 2, FALSE);
- insert_label_entry(export->slot, _("Target file:"), &export->prog_file_entry2, NULL, 2, 3, FALSE);
-
- export->prog_cancel_button = gui_stock_label_button(_("Abort"), GTK_STOCK_CANCEL);
- g_signal_connect(export->prog_cancel_button, "clicked", G_CALLBACK(export_cancel_event), export);
- insert_label_progbar_button(export->slot, _("Progress:"), &export->progbar, export->prog_cancel_button, 3, 4);
-
- gtk_table_attach(GTK_TABLE(export->slot), gtk_hseparator_new(), 0, 2, 4, 5,
- GTK_FILL, GTK_FILL, 5, 5);
-
- gtk_widget_grab_focus(export->prog_cancel_button);
-
- gtk_widget_show_all(export->slot);
-}
-
-
-int
-export_start(export_t * export) {
-
- if (export_dialog(export)) {
- export_progress_window(export);
- export->progbar_tag = aqualung_timeout_add(250, update_progbar_ratio, export);
- AQUALUNG_THREAD_CREATE(export->thread_id, NULL, export_thread, export);
- return 1;
- }
-
- export_free(export);
- return 0;
-}
-
-
// vim: shiftwidth=8:tabstop=8:softtabstop=8 :
Modified: trunk/src/export.h
===================================================================
--- trunk/src/export.h 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/export.h 2014-05-02 12:29:01 UTC (rev 1292)
@@ -77,6 +77,11 @@
GtkWidget * bitrate_value_label;
GtkWidget * vbr_check;
GtkWidget * meta_check;
+ GtkWidget * outdir_entry;
+ GtkWidget * templ_entry;
+ GtkWidget * check_filter_same;
+ GtkWidget * check_excl_enabled;
+ GtkWidget * excl_entry;
GtkWidget * slot;
GtkWidget * prog_file_entry1;
@@ -89,7 +94,7 @@
export_t * export_new(void);
void export_append_item(export_t * export, char * infile,
char * artist, char * album, char * title, int year, int no);
-int export_start(export_t * export);
+void export_start(export_t * export);
#endif /* AQUALUNG_EXPORT_H */
Modified: trunk/src/file_info.c
===================================================================
--- trunk/src/file_info.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/file_info.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -1792,7 +1792,6 @@
fi->info_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
register_toplevel_window(fi->info_window, TOP_WIN_SKIN | TOP_WIN_TRAY);
gtk_window_set_title(GTK_WINDOW(fi->info_window), _("File info"));
- gtk_window_set_modal(GTK_WINDOW(fi->info_window), TRUE);
gtk_window_set_transient_for(GTK_WINDOW(fi->info_window), GTK_WINDOW(main_window));
gtk_window_set_position(GTK_WINDOW(fi->info_window), GTK_WIN_POS_CENTER);
gtk_window_set_resizable(GTK_WINDOW(fi->info_window), TRUE);
Modified: trunk/src/ifp_device.c
===================================================================
--- trunk/src/ifp_device.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/ifp_device.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -382,7 +382,7 @@
if (strncmp(remote_item, PARENTDIR, 2)) {
rename_dialog = gtk_message_dialog_new (GTK_WINDOW(aifp_window),
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, _("Please enter a new name."));
gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Rename"));
@@ -952,7 +952,6 @@
gtk_window_set_position(GTK_WINDOW(aifp_window), GTK_WIN_POS_CENTER_ALWAYS);
gtk_window_set_transient_for(GTK_WINDOW(aifp_window),
options.playlist_is_embedded ? GTK_WINDOW(main_window) : GTK_WINDOW(playlist_window));
- gtk_window_set_modal(GTK_WINDOW(aifp_window), TRUE);
g_signal_connect(G_OBJECT(aifp_window), "delete_event",
G_CALLBACK(aifp_window_close), NULL);
g_signal_connect(G_OBJECT(aifp_window), "key_press_event",
Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/options.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -1819,11 +1819,91 @@
#endif /* HAVE_SYSTRAY */
+gboolean
+options_dialog_close(GtkWidget * widget, GdkEvent * event, gpointer data) {
+
+ current_notebook_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
+
+ gtk_widget_destroy(options_window);
+ options_window = NULL;
+
+#ifdef HAVE_SYSTRAY
+ gtk_list_store_clear(systray_mouse_buttons_store);
+ gtk_list_store_clear(systray_mouse_buttons_cmds_store);
+#endif /* HAVE_SYSTRAY */
+
+ return TRUE;
+}
+
+gboolean
+options_dialog_response(GtkDialog * dialog, gint response_id, gpointer data) {
+
+ int ret;
+ char buf[MAXLEN];
+ char * format = (char *)gtk_entry_get_text(GTK_ENTRY(entry_title));
+ char * encode = (char *)gtk_entry_get_text(GTK_ENTRY(encode_set_entry));
+
+ if (response_id != GTK_RESPONSE_ACCEPT) {
+ gtk_widget_destroy(options_window);
+ options_window = NULL;
+ return TRUE;
+ }
+
+ current_notebook_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
+
+ if ((ret = make_string_va(buf, format, 'a', "a", 'r', "r", 't', "t", 0)) != 0) {
+ make_string_strerror(ret, buf);
+ message_dialog(_("Error in title format string"),
+ options_window,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ NULL,
+ buf);
+ return FALSE;
+ }
+
+ if (strlen(encode)) {
+ GError * error = NULL;
+ gchar * str = g_convert("", -1, "utf-8", encode, NULL, NULL, &error);
+ if (str != NULL) {
+ g_free(str);
+ } else {
+ message_dialog(_("Error invalid character encoding"),
+ options_window,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ NULL,
+ "%s", error->message);
+ g_clear_error(&error);
+ gtk_entry_set_text(GTK_ENTRY(encode_set_entry), "");
+ return FALSE;
+ }
+ }
+
+ options_window_accept();
+ gtk_widget_destroy(options_window);
+ options_window = NULL;
+
+ if (reskin_flag) {
+ if (!options.disable_skin_support_settings) {
+ apply_skin(options.skin);
+ gtk_widget_show(conf__skin);
+ } else {
+ gtk_widget_hide(conf__skin);
+ }
+ }
+
+#ifdef HAVE_SYSTRAY
+ gtk_list_store_clear(systray_mouse_buttons_store);
+ gtk_list_store_clear(systray_mouse_buttons_cmds_store);
+#endif /* HAVE_SYSTRAY */
+
+ return TRUE;
+}
+
void
create_options_window(void) {
- int ret;
-
GtkWidget * vbox_general;
GtkWidget * nbook_general;
GtkWidget * frame_title;
@@ -1923,6 +2003,10 @@
#endif /* HAVE_LADSPA */
int i;
+ if (options_window != NULL) {
+ return;
+ }
+
restart_flag = 0;
reskin_flag = 0;
appearance_changed = 0;
@@ -1941,11 +2025,12 @@
refresh_ms_pathlist_clicked(NULL, NULL);
options_window = gtk_dialog_new_with_buttons(_("Settings"),
- GTK_WINDOW(main_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- NULL);
+ GTK_WINDOW(main_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ NULL);
+
gtk_window_set_position(GTK_WINDOW(options_window), GTK_WIN_POS_CENTER);
gtk_dialog_set_default_response(GTK_DIALOG(options_window), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(options_window), 5);
@@ -1955,6 +2040,11 @@
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(options_window))),
notebook);
+ g_signal_connect(G_OBJECT(options_window), "response",
+ G_CALLBACK(options_dialog_response), NULL);
+ g_signal_connect(G_OBJECT(options_window), "delete_event",
+ G_CALLBACK(options_dialog_close), NULL);
+
label_size = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
/* "General" notebook page */
@@ -3692,63 +3782,7 @@
gtk_widget_show_all(options_window);
gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), current_notebook_page);
- display:
- ret = aqualung_dialog_run(GTK_DIALOG(options_window));
-
- current_notebook_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-
- if (ret == GTK_RESPONSE_ACCEPT) {
- char buf[MAXLEN];
- char * format = (char *)gtk_entry_get_text(GTK_ENTRY(entry_title));
- char * encode = (char *)gtk_entry_get_text(GTK_ENTRY(encode_set_entry));
- if ((ret = make_string_va(buf, format, 'a', "a", 'r', "r", 't', "t", 0)) != 0) {
- make_string_strerror(ret, buf);
- message_dialog(_("Error in title format string"),
- options_window,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- NULL,
- buf);
- goto display;
- }
-
- if (strlen(encode)) {
- GError * error = NULL;
- gchar * str = g_convert("", -1, "utf-8", encode, NULL, NULL, &error);
- if (str != NULL) {
- g_free(str);
- } else {
- message_dialog(_("Error invalid character encoding"),
- options_window,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- NULL,
- "%s", error->message);
- g_clear_error(&error);
- gtk_entry_set_text(GTK_ENTRY(encode_set_entry), "");
- goto display;
- }
- }
-
- options_window_accept();
- gtk_widget_destroy(options_window);
-
- if (reskin_flag) {
- if (!options.disable_skin_support_settings) {
- apply_skin(options.skin);
- gtk_widget_show(conf__skin);
- } else {
- gtk_widget_hide(conf__skin);
- }
- }
- } else {
- gtk_widget_destroy(options_window);
- }
-
-#ifdef HAVE_SYSTRAY
- gtk_list_store_clear(systray_mouse_buttons_store);
- gtk_list_store_clear(systray_mouse_buttons_cmds_store);
-#endif /* HAVE_SYSTRAY */
+ return;
}
Modified: trunk/src/playlist.c
===================================================================
--- trunk/src/playlist.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/playlist.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -2008,7 +2008,7 @@
dialog = gtk_dialog_new_with_buttons(_("Add URL"),
options.playlist_is_embedded ? GTK_WINDOW(main_window) : GTK_WINDOW(playlist_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
@@ -3733,7 +3733,7 @@
dialog = gtk_dialog_new_with_buttons(_("Rename playlist"),
options.playlist_is_embedded ? GTK_WINDOW(main_window) : GTK_WINDOW(playlist_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/search.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -479,7 +479,6 @@
gtk_window_set_title(GTK_WINDOW(search_window), _("Search the Music Store"));
gtk_window_set_position(GTK_WINDOW(search_window), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_transient_for(GTK_WINDOW(search_window), GTK_WINDOW(browser_window));
- gtk_window_set_modal(GTK_WINDOW(search_window), TRUE);
g_signal_connect(G_OBJECT(search_window), "delete_event",
G_CALLBACK(search_window_close), NULL);
g_signal_connect(G_OBJECT(search_window), "key_press_event",
Modified: trunk/src/search_playlist.c
===================================================================
--- trunk/src/search_playlist.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/search_playlist.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -341,7 +341,6 @@
gtk_window_set_transient_for(GTK_WINDOW(search_window), GTK_WINDOW(playlist_window));
}
- gtk_window_set_modal(GTK_WINDOW(search_window), TRUE);
g_signal_connect(G_OBJECT(search_window), "delete_event",
G_CALLBACK(search_window_close), NULL);
g_signal_connect(G_OBJECT(search_window), "key_press_event",
Modified: trunk/src/store_cdda.c
===================================================================
--- trunk/src/store_cdda.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/store_cdda.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -192,7 +192,7 @@
dialog = gtk_dialog_new_with_buttons(str,
GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT |
+ GTK_DIALOG_DESTROY_WITH_PARENT |
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
@@ -354,7 +354,7 @@
dialog = gtk_dialog_new_with_buttons(_("Disc info"),
GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT |
+ GTK_DIALOG_DESTROY_WITH_PARENT |
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
Modified: trunk/src/store_file.c
===================================================================
--- trunk/src/store_file.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/store_file.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -387,7 +387,7 @@
*dialog = gtk_dialog_new_with_buttons(title,
GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
Modified: trunk/src/store_podcast.c
===================================================================
--- trunk/src/store_podcast.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/store_podcast.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -286,7 +286,7 @@
dialog = gtk_dialog_new_with_buttons(create ? _("Subscribe to new feed") : _("Edit feed settings"),
GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
@@ -915,7 +915,7 @@
dialog = gtk_dialog_new_with_buttons(_("Reorder feeds"),
GTK_WINDOW(browser_window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
@@ -1079,10 +1079,9 @@
podcast_track_export(&iter_track, export, NULL, NULL, 0);
- if (export_start(export)) {
- podcast_tree_mark_read(&iter_track, 3);
- store_podcast_save();
- }
+ export_start(export);
+ podcast_tree_mark_read(&iter_track, 3);
+ store_podcast_save();
}
}
@@ -1100,10 +1099,9 @@
podcast_feed_export(&iter_podcast, export, (user_data == (gpointer)1) ? 1 : 0);
- if (export_start(export)) {
- podcast_tree_mark_read(&iter_podcast, 2);
- store_podcast_save();
- }
+ export_start(export);
+ podcast_tree_mark_read(&iter_podcast, 2);
+ store_podcast_save();
}
}
@@ -1127,10 +1125,9 @@
podcast_feed_export(&iter_podcast, export, (user_data == (gpointer)1) ? 1 : 0);
}
- if (export_start(export)) {
- podcast_tree_mark_read(&iter_store, 1);
- store_podcast_save();
- }
+ export_start(export);
+ podcast_tree_mark_read(&iter_store, 1);
+ store_podcast_save();
}
}
#endif /* HAVE_TRANSCODING */
Modified: trunk/src/utils_gui.c
===================================================================
--- trunk/src/utils_gui.c 2014-05-02 12:28:33 UTC (rev 1291)
+++ trunk/src/utils_gui.c 2014-05-02 12:29:01 UTC (rev 1292)
@@ -654,7 +654,7 @@
va_end(args);
dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
type,
buttons,
"%s",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-05-02 12:28:36
|
Revision: 1291
http://sourceforge.net/p/aqualung/code/1291
Author: tszilagyi
Date: 2014-05-02 12:28:33 +0000 (Fri, 02 May 2014)
Log Message:
-----------
Better error messages when encoder cannot be created
The vorbis encoder cannot be initialized for very low bitrates. In
these cases a meaningful error message is printed to the console.
This is still not the best solution, but better than nothing.
Modified Paths:
--------------
trunk/src/encoder/enc_vorbis.c
trunk/src/encoder/file_encoder.c
Modified: trunk/src/encoder/enc_vorbis.c
===================================================================
--- trunk/src/encoder/enc_vorbis.c 2014-04-27 20:52:02 UTC (rev 1290)
+++ trunk/src/encoder/enc_vorbis.c 2014-05-02 12:28:33 UTC (rev 1291)
@@ -88,8 +88,11 @@
vorbis_encode_ctl(&pd->vi, OV_ECTL_RATEMANAGE2_SET, NULL) ||
vorbis_encode_setup_init(&pd->vi));
- if (ret)
+ if (ret) {
+ fprintf(stdout, "vorbisenc_encoder_open(): cannot setup encoding with set params (bps=%d)\n",
+ mode->bps);
return -1;
+ }
vorbis_comment_init(&pd->vc);
if (mode->write_meta) {
Modified: trunk/src/encoder/file_encoder.c
===================================================================
--- trunk/src/encoder/file_encoder.c 2014-04-27 20:52:02 UTC (rev 1290)
+++ trunk/src/encoder/file_encoder.c 2014-05-02 12:28:33 UTC (rev 1291)
@@ -76,18 +76,18 @@
encoder_t * enc;
if (mode->filename == NULL) {
- fprintf(stderr, "Warning: filename == NULL passed to file_encoder_open()\n");
+ fprintf(stderr, "error: filename == NULL passed to file_encoder_open()\n");
return 1;
}
enc = encoder_init_v[mode->file_lib](fenc);
if (!enc) {
- fprintf(stderr, "Warning: error initializing encoder %d.\n", mode->file_lib);
+ fprintf(stderr, "error initializing encoder %d.\n", mode->file_lib);
return 1;
}
if (enc->open(enc, mode) != 0) {
- fprintf(stderr, "Warning: error opening encoder %d.\n", mode->file_lib);
+ fprintf(stderr, "error opening encoder %d.\n", mode->file_lib);
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-04-27 20:52:05
|
Revision: 1290
http://sourceforge.net/p/aqualung/code/1290
Author: tszilagyi
Date: 2014-04-27 20:52:02 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
Refactor 'About' dialog box code generating compiled-in feature list (pulled from Jamie Heilman)
Modified Paths:
--------------
trunk/src/about.c
trunk/src/about.h
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2014-04-27 20:51:41 UTC (rev 1289)
+++ trunk/src/about.c 2014-04-27 20:52:02 UTC (rev 1290)
@@ -34,6 +34,160 @@
#include "about.h"
+#define BUILT_IN " [+] "
+#define LEFT_OUT " [ ] "
+#ifndef HAVE_LADSPA
+#define BUILT_W_LADSPA LEFT_OUT
+#else /* HAVE_LADSPA */
+#define BUILT_W_LADSPA BUILT_IN
+#endif /* HAVE_LADSPA */
+#ifndef HAVE_CDDA
+#define BUILT_W_CDDA LEFT_OUT
+#else /* HAVE_CDDA */
+#define BUILT_W_CDDA BUILT_IN
+#endif /* HAVE_CDDA */
+#ifndef HAVE_CDDB
+#define BUILT_W_CDDB LEFT_OUT
+#else /* HAVE_CDDB */
+#define BUILT_W_CDDB BUILT_IN
+#endif /* HAVE_CDDB */
+#ifndef HAVE_SRC
+#define BUILT_W_SRC LEFT_OUT
+#else /* HAVE_SRC */
+#define BUILT_W_SRC BUILT_IN
+#endif /* HAVE_SRC */
+#ifndef HAVE_IFP
+#define BUILT_W_IFP LEFT_OUT
+#else /* HAVE_IFP */
+#define BUILT_W_IFP BUILT_IN
+#endif /* HAVE_IFP */
+#ifndef HAVE_JACK_MGMT
+#define BUILT_W_JACK_MGMT LEFT_OUT
+#else /* HAVE_JACK_MGMT */
+#define BUILT_W_JACK_MGMT BUILT_IN
+#endif /* HAVE_JACK_MGMT */
+#ifndef HAVE_LOOP
+#define BUILT_W_LOOP LEFT_OUT
+#else /* HAVE_LOOP */
+#define BUILT_W_LOOP BUILT_IN
+#endif /* HAVE_LOOP */
+#ifndef HAVE_SYSTRAY
+#define BUILT_W_SYSTRAY LEFT_OUT
+#else /* HAVE_SYSTRAY */
+#define BUILT_W_SYSTRAY BUILT_IN
+#endif /* HAVE_SYSTRAY */
+#ifndef HAVE_PODCAST
+#define BUILT_W_PODCAST LEFT_OUT
+#else /* HAVE_PODCAST */
+#define BUILT_W_PODCAST BUILT_IN
+#endif /* HAVE_PODCAST */
+#ifndef HAVE_LUA
+#define BUILT_W_LUA LEFT_OUT
+#else /* HAVE_LUA */
+#define BUILT_W_LUA BUILT_IN
+#endif /* HAVE_LUA */
+#ifndef HAVE_SNDFILE
+#define BUILT_W_SNDFILE LEFT_OUT
+#else /* HAVE_SNDFILE */
+#define BUILT_W_SNDFILE BUILT_IN
+#endif /* HAVE_SNDFILE */
+#ifndef HAVE_FLAC
+#define BUILT_W_FLAC LEFT_OUT
+#else /* HAVE_FLAC */
+#define BUILT_W_FLAC BUILT_IN
+#endif /* HAVE_FLAC */
+#ifndef HAVE_VORBIS
+#define BUILT_W_VORBIS LEFT_OUT
+#else /* HAVE_VORBIS */
+#define BUILT_W_VORBIS BUILT_IN
+#endif /* HAVE_VORBIS */
+#ifndef HAVE_SPEEX
+#define BUILT_W_SPEEX LEFT_OUT
+#else /* HAVE_SPEEX */
+#define BUILT_W_SPEEX BUILT_IN
+#endif /* HAVE_SPEEX */
+#ifndef HAVE_MPEG
+#define BUILT_W_MPEG LEFT_OUT
+#else /* HAVE_MPEG */
+#define BUILT_W_MPEG BUILT_IN
+#endif /* HAVE_MPEG */
+#ifndef HAVE_MOD
+#define BUILT_W_MOD LEFT_OUT
+#else /* HAVE_MOD */
+#define BUILT_W_MOD BUILT_IN
+#endif /* HAVE_MOD */
+#ifndef HAVE_MPC
+#define BUILT_W_MPC LEFT_OUT
+#else /* HAVE_MPC */
+#define BUILT_W_MPC BUILT_IN
+#endif /* HAVE_MPC */
+#ifndef HAVE_MAC
+#define BUILT_W_MAC LEFT_OUT
+#else /* HAVE_MAC */
+#define BUILT_W_MAC BUILT_IN
+#endif /* HAVE_MAC */
+#ifndef HAVE_WAVPACK
+#define BUILT_W_WAVPACK LEFT_OUT
+#else /* HAVE_WAVPACK */
+#define BUILT_W_WAVPACK BUILT_IN
+#endif /* HAVE_WAVPACK */
+#ifndef HAVE_LAVC
+#define BUILT_W_LAVC LEFT_OUT
+#else /* HAVE_LAVC */
+#define BUILT_W_LAVC BUILT_IN
+#endif /* HAVE_LAVC */
+#ifndef HAVE_SNDFILE_ENC
+#define BUILT_W_SNDFILE_ENC LEFT_OUT
+#else /* HAVE_SNDFILE_ENC */
+#define BUILT_W_SNDFILE_ENC BUILT_IN
+#endif /* HAVE_SNDFILE_ENC */
+#ifndef HAVE_FLAC_ENC
+#define BUILT_W_FLAC_ENC LEFT_OUT
+#else /* HAVE_FLAC_ENC */
+#define BUILT_W_FLAC_ENC BUILT_IN
+#endif /* HAVE_FLAC_ENC */
+#ifndef HAVE_VORBISENC
+#define BUILT_W_VORBISENC LEFT_OUT
+#else /* HAVE_VORBISENC */
+#define BUILT_W_VORBISENC BUILT_IN
+#endif /* HAVE_VORBISENC */
+#ifndef HAVE_LAME
+#define BUILT_W_LAME LEFT_OUT
+#else /* HAVE_LAME */
+#define BUILT_W_LAME BUILT_IN
+#endif /* HAVE_LAME */
+#ifndef HAVE_SNDIO
+#define BUILT_W_SNDIO LEFT_OUT
+#else /* HAVE_SNDIO */
+#define BUILT_W_SNDIO BUILT_IN
+#endif /* HAVE_SNDIO */
+#ifndef HAVE_OSS
+#define BUILT_W_OSS LEFT_OUT
+#else /* HAVE_OSS */
+#define BUILT_W_OSS BUILT_IN
+#endif /* HAVE_OSS */
+#ifndef HAVE_ALSA
+#define BUILT_W_ALSA LEFT_OUT
+#else /* HAVE_ALSA */
+#define BUILT_W_ALSA BUILT_IN
+#endif /* HAVE_ALSA */
+#ifndef HAVE_JACK
+#define BUILT_W_JACK LEFT_OUT
+#else /* HAVE_JACK */
+#define BUILT_W_JACK BUILT_IN
+#endif /* HAVE_JACK */
+#ifndef HAVE_PULSE
+#define BUILT_W_PULSE LEFT_OUT
+#else /* HAVE_PULSE */
+#define BUILT_W_PULSE BUILT_IN
+#endif /* HAVE_PULSE */
+#ifndef HAVE_WINMM
+#define BUILT_W_WINMM LEFT_OUT
+#else /* HAVE_WINMM */
+#define BUILT_W_WINMM BUILT_IN
+#endif /* HAVE_WINMM */
+
+
GtkWidget * about_window;
extern GtkWidget * main_window;
@@ -60,7 +214,47 @@
return FALSE;
}
+gchar *
+about_build(void) {
+ return g_strconcat(
+ "\n ", _("Optional features:"), "\n",
+ BUILT_W_LADSPA, _("LADSPA plugin support\n"),
+ BUILT_W_CDDA, _("CDDA (Audio CD) support\n"),
+ BUILT_W_CDDB, _("CDDB support\n"),
+ BUILT_W_SRC, _("Sample Rate Converter support\n"),
+ BUILT_W_IFP, _("iRiver iFP driver support\n"),
+ BUILT_W_JACK_MGMT, _("JACK port management support\n"),
+ BUILT_W_LOOP, _("Loop playback support\n"),
+ BUILT_W_SYSTRAY, _("Systray support\n"),
+ BUILT_W_PODCAST, _("Podcast support\n"),
+ BUILT_W_LUA, _("Lua extension support\n"),
+ "\n ", _("Decoding support:"), "\n",
+ BUILT_W_SNDFILE, _("sndfile (WAV, AIFF, etc.)\n"),
+ BUILT_W_FLAC, _("Free Lossless Audio Codec (FLAC)\n"),
+ BUILT_W_VORBIS, _("Ogg Vorbis\n"),
+ BUILT_W_SPEEX, _("Ogg Speex\n"),
+ BUILT_W_MPEG, _("MPEG Audio (MPEG 1-2.5 Layer I-III)\n"),
+ BUILT_W_MOD, _("MOD Audio (MOD, S3M, XM, IT, etc.)\n"),
+ BUILT_W_MPC, _("Musepack\n"),
+ BUILT_W_MAC, _("Monkey's Audio Codec\n"),
+ BUILT_W_WAVPACK, _("WavPack\n"),
+ BUILT_W_LAVC, _("LAVC (AC3, AAC, WavPack, WMA, etc.)\n"),
+ "\n ", _("Encoding support:"), "\n",
+ BUILT_W_SNDFILE_ENC, _("sndfile (WAV)\n"),
+ BUILT_W_FLAC_ENC, _("Free Lossless Audio Codec (FLAC)\n"),
+ BUILT_W_VORBISENC, _("Ogg Vorbis\n"),
+ BUILT_W_LAME, _("LAME (MP3)\n"),
+ "\n ", _("Output driver support:"), "\n",
+ BUILT_W_SNDIO, _("sndio Audio\n"),
+ BUILT_W_OSS, _("OSS Audio\n"),
+ BUILT_W_ALSA, _("ALSA Audio\n"),
+ BUILT_W_JACK, _("JACK Audio Server\n"),
+ BUILT_W_PULSE, _("PulseAudio\n"),
+ BUILT_W_WINMM, _("Win32 Sound API\n"),
+ NULL);
+}
+
void
create_about_window() {
@@ -89,6 +283,7 @@
GtkTextTag * tag2;
char path[MAXLEN];
+ gchar * build_info = about_build();
about_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_transient_for(GTK_WINDOW(about_window), GTK_WINDOW(main_window));
@@ -220,359 +415,13 @@
gtk_text_buffer_get_end_iter(buffer, &iter);
gtk_text_buffer_insert_with_tags(buffer, &iter,
_("This Aqualung binary is compiled with:"), -1, tag, NULL);
-
- gtk_text_buffer_insert_at_cursor(buffer, "\n\n\t", -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, _("Optional features:"), -1);
gtk_text_buffer_insert_at_cursor(buffer, "\n", -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_LADSPA
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_LADSPA */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("LADSPA plugin support\n"), -1);
+ gtk_text_buffer_insert_with_tags(buffer, &iter, build_info, -1,
+ tag2, NULL);
+ g_free(build_info);
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_CDDA
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_CDDA */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("CDDA (Audio CD) support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_CDDB
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_CDDB */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("CDDB support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SRC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SRC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Sample Rate Converter support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_IFP
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_IFP */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("iRiver iFP driver support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_JACK_MGMT
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_JACK_MGMT */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("JACK port management support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_LOOP
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_LOOP */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Loop playback support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SYSTRAY
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SYSTRAY */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Systray support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_PODCAST
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_PODCAST */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Podcast support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_LUA
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_LUA */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Lua extension support\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\n\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Decoding support:"), -1);
- gtk_text_buffer_insert_at_cursor(buffer, "\n", -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SNDFILE
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SNDFILE */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("sndfile (WAV, AIFF, etc.)\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_FLAC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_FLAC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Free Lossless Audio Codec (FLAC)\n"), -1);
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_VORBIS
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_VORBIS */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Ogg Vorbis\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SPEEX
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SPEEX */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Ogg Speex\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_MPEG
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_MPEG */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("MPEG Audio (MPEG 1-2.5 Layer I-III)\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_MOD
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_MOD */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("MOD Audio (MOD, S3M, XM, IT, etc.)\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_MPC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_MPC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Musepack\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_MAC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_MAC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Monkey's Audio Codec\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_WAVPACK
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_WAVPACK */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("WavPack\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_LAVC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_LAVC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("LAVC (AC3, AAC, WavPack, WMA, etc.)\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\n\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Encoding support:"), -1);
- gtk_text_buffer_insert_at_cursor(buffer, "\n", -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SNDFILE_ENC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SNDFILE_ENC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("sndfile (WAV)\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_FLAC_ENC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_FLAC_ENC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Free Lossless Audio Codec (FLAC)\n"), -1);
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_VORBISENC
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_VORBISENC */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Ogg Vorbis\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_LAME
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_LAME */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("LAME (MP3)\n"), -1);
-
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\n\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Output driver support:"), -1);
- gtk_text_buffer_insert_at_cursor(buffer, "\n", -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_SNDIO
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_SNDIO */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("sndio Audio\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_OSS
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_OSS */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("OSS Audio\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_ALSA
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_ALSA */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("ALSA Audio\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_JACK
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_JACK */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("JACK Audio Server\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_PULSE
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_PULSE */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("PulseAudio\n"), -1);
-
-
- gtk_text_buffer_insert_at_cursor(buffer, "\t\t[", -1);
- gtk_text_buffer_get_end_iter(buffer, &iter);
-#ifdef HAVE_WINMM
- gtk_text_buffer_insert_with_tags(buffer, &iter, "+", -1, tag2, NULL);
-#else
- gtk_text_buffer_insert_with_tags(buffer, &iter, " ", -1, tag2, NULL);
-#endif /* HAVE_WINMM */
- gtk_text_buffer_insert_at_cursor(buffer, "]\t", -1);
- gtk_text_buffer_insert_at_cursor(buffer, _("Win32 Sound API\n"), -1);
-
-
-
gtk_text_buffer_insert_at_cursor(buffer, "\n\n", -1);
gtk_text_buffer_insert_at_cursor(buffer,
_("This program is free software; you can redistribute it and/or modify "
Modified: trunk/src/about.h
===================================================================
--- trunk/src/about.h 2014-04-27 20:51:41 UTC (rev 1289)
+++ trunk/src/about.h 2014-04-27 20:52:02 UTC (rev 1290)
@@ -21,6 +21,10 @@
#ifndef AQUALUNG_ABOUT_H
#define AQUALUNG_ABOUT_H
+#include <glib.h>
+
+
+gchar * about_build(void);
void create_about_window(void);
#endif /* AQUALUNG_ABOUT_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-04-27 20:51:43
|
Revision: 1289
http://sourceforge.net/p/aqualung/code/1289
Author: tszilagyi
Date: 2014-04-27 20:51:41 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
threading: refactor priority scheduling w/pthreads
Instead of PTHREAD_(MIN|MAX)_PRIORITY macros, use the
sched_get_priority_(min|max) functions, and ensure a sane priority
transition if no priority is given by the user. Also use glib message
logging routines and string utility functions instead of stdio and
string.h as they're UTF-8 friendly and generally nicer.
Modified Paths:
--------------
trunk/src/athread.c
trunk/src/athread.h
trunk/src/core.c
Modified: trunk/src/athread.c
===================================================================
--- trunk/src/athread.c 2014-04-27 20:51:24 UTC (rev 1288)
+++ trunk/src/athread.c 2014-04-27 20:51:41 UTC (rev 1289)
@@ -20,69 +20,67 @@
#include <config.h>
+#include <glib.h>
+
#include "athread.h"
#ifdef HAVE_LIBPTHREAD
-#include <stdio.h>
-#include <string.h>
#include <pthread.h>
#include <sched.h>
void
-set_thread_priority(pthread_t thread, char * name, int realtime, int priority) {
+set_thread_priority(pthread_t thread, const gchar * name, gboolean realtime,
+ gint priority) {
struct sched_param param;
- int policy;
- int x;
+ int policy, priority_min, priority_max;
+ int err;
- if (pthread_getschedparam(thread, &policy, ¶m) != 0) {
+ if ((err = pthread_getschedparam(thread, &policy, ¶m)) != 0) {
+ g_debug("cannot get scheduling policy for %s thread: %s",
+ name, g_strerror(err));
return;
}
if (realtime) {
policy = SCHED_FIFO;
-#ifndef __OpenBSD__
- if (priority == -1) {
- priority = 1;
- }
-#endif /* !__OpenBSD__ */
}
+ priority_min = sched_get_priority_min(policy);
+ priority_max = sched_get_priority_max(policy);
if (priority != -1) {
-#ifdef PTHREAD_MIN_PRIORITY
-#ifdef PTHREAD_MAX_PRIORITY
- if (priority < PTHREAD_MIN_PRIORITY) {
- param.sched_priority = PTHREAD_MIN_PRIORITY;
- fprintf(stderr, "Warning: %s thread priority (%d) too low, set to %d",
- name, priority, PTHREAD_MIN_PRIORITY);
- } else if (priority > PTHREAD_MAX_PRIORITY) {
- param.sched_priority = PTHREAD_MAX_PRIORITY;
- fprintf(stderr, "Warning: %s thread priority (%d) too high, set to %d",
- name, priority, PTHREAD_MAX_PRIORITY);
- } else
-#endif /* PTHREAD_MAX_PRIORITY */
-#endif /* PTHREAD_MIN_PRIORITY */
- {
- param.sched_priority = priority;
+ if (priority < priority_min) {
+ g_warning("%s thread priority (%d) too low, set to %d",
+ name, priority, priority_min);
+ priority = priority_min;
+ } else if (priority > priority_max) {
+ g_warning("%s thread priority (%d) too high, set to %d",
+ name, priority, priority_max);
+ priority = priority_max;
}
+ param.sched_priority = priority;
+ } else {
+ if (param.sched_priority < priority_min) {
+ param.sched_priority = priority_min;
+ } else if (param.sched_priority > priority_max) {
+ param.sched_priority = priority_max;
+ }
}
- if ((x = pthread_setschedparam(thread, policy, ¶m)) != 0) {
- fprintf(stderr,
- "Warning: cannot use real-time scheduling for %s thread (%s/%d) "
- "(%d: %s)\n", name, policy == SCHED_FIFO ? "FIFO" : "RR", param.sched_priority,
- x, strerror(x));
+ if ((err = pthread_setschedparam(thread, policy, ¶m)) != 0) {
+ g_warning("cannot set scheduling policy for %s thread: %s",
+ name, g_strerror(err));
}
}
#else /* !HAVE_LIBPTHREAD */
-#include <glib.h>
void
-set_thread_priority(GThread * thread, char * name, int realtime, int priority) {
+set_thread_priority(GThread * thread, const gchar * name, gboolean realtime,
+ gint priority) {
if (realtime)
g_thread_set_priority(thread, G_THREAD_PRIORITY_URGENT);
Modified: trunk/src/athread.h
===================================================================
--- trunk/src/athread.h 2014-04-27 20:51:24 UTC (rev 1288)
+++ trunk/src/athread.h 2014-04-27 20:51:41 UTC (rev 1289)
@@ -24,6 +24,7 @@
#include <config.h>
#include <stddef.h>
+#include <glib.h>
#ifdef HAVE_LIBPTHREAD
@@ -52,12 +53,11 @@
pthread_cond_timedwait(&(cond), &(mutex), &(timeout));
#define AQUALUNG_COND_WAIT(cond, mutex) pthread_cond_wait(&(cond), &(mutex));
-void set_thread_priority(pthread_t thread, char * name, int realtime, int priority);
+void set_thread_priority(pthread_t thread, const gchar * name,
+ gboolean realtime, gint priority);
#else /* !HAVE_LIBPTHREAD */
-#include <glib.h>
-
#define AQUALUNG_THREAD_DECLARE(thread_id) GThread * thread_id;
#define AQUALUNG_THREAD_CREATE(id, attr, func, args) \
id = g_thread_create(func, args, TRUE, NULL);
@@ -78,7 +78,8 @@
g_cond_timed_wait(cond, mutex, timeout);
#define AQUALUNG_COND_WAIT(cond, mutex) g_cond_wait(cond, mutex);
-void set_thread_priority(GThread * thread, char * name, int realtime, int priority);
+void set_thread_priority(GThread * thread, const gchar * name,
+ gboolean realtime, gint priority);
#endif /* !HAVE_LIBPTHREAD */
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-04-27 20:51:24 UTC (rev 1288)
+++ trunk/src/core.c 2014-04-27 20:51:41 UTC (rev 1289)
@@ -1227,7 +1227,7 @@
* -N : unable to start with given params
*/
int
-sndio_init(thread_info_t * info, int verbose, int realtime, int priority) {
+sndio_init(thread_info_t * info, int verbose, gboolean realtime, int priority) {
struct sio_hdl * sndio_hdl;
struct sio_par sndio_par;
@@ -1308,7 +1308,7 @@
* -N : unable to start with given params
*/
int
-oss_init(thread_info_t * info, int verbose, int realtime, int priority) {
+oss_init(thread_info_t * info, int verbose, gboolean realtime, int priority) {
int ioctl_arg;
int ioctl_status;
@@ -1626,7 +1626,7 @@
* N = error code returned by PulseAudio.
*/
int
-pulse_init(thread_info_t * info, int verbose, int realtime, int priority) {
+pulse_init(thread_info_t * info, int verbose, gboolean realtime, int priority) {
int err = 0;
if (info->out_SR > MAX_SAMPLERATE) {
@@ -2377,9 +2377,9 @@
int show_usage = 0;
char * output_str = NULL;
int rate = 0;
- int try_realtime = 0;
+ gboolean try_realtime = FALSE;
int priority = -1;
- int disk_try_realtime = 0;
+ gboolean disk_try_realtime = FALSE;
int disk_priority = -1;
char rcmd;
@@ -2596,13 +2596,13 @@
#endif /* HAVE_JACK */
break;
case 'R':
- try_realtime = 1;
+ try_realtime = TRUE;
break;
case 'P':
priority = atoi(optarg);
break;
case 'D':
- disk_try_realtime = 1;
+ disk_try_realtime = TRUE;
break;
case 'Y':
disk_priority = atoi(optarg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-04-27 20:51:27
|
Revision: 1288
http://sourceforge.net/p/aqualung/code/1288
Author: tszilagyi
Date: 2014-04-27 20:51:24 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
threading: move set_thread_priority() to athread.c
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/athread.h
trunk/src/core.c
Added Paths:
-----------
trunk/src/athread.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2014-04-27 20:51:08 UTC (rev 1287)
+++ trunk/src/Makefile.am 2014-04-27 20:51:24 UTC (rev 1288)
@@ -31,7 +31,7 @@
aqualung_SOURCES = \
about.h about.c \
-athread.h \
+athread.h athread.c \
build_store.h build_store.c \
common.h \
core.h core.c \
Added: trunk/src/athread.c
===================================================================
--- trunk/src/athread.c (rev 0)
+++ trunk/src/athread.c 2014-04-27 20:51:24 UTC (rev 1288)
@@ -0,0 +1,95 @@
+/* -*- linux-c -*-
+ Copyright (C) 2004 Tom Szilagyi
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id$
+*/
+
+#include <config.h>
+
+#include "athread.h"
+
+#ifdef HAVE_LIBPTHREAD
+#include <stdio.h>
+#include <string.h>
+#include <pthread.h>
+#include <sched.h>
+
+
+void
+set_thread_priority(pthread_t thread, char * name, int realtime, int priority) {
+
+ struct sched_param param;
+ int policy;
+ int x;
+
+ if (pthread_getschedparam(thread, &policy, ¶m) != 0) {
+ return;
+ }
+
+ if (realtime) {
+ policy = SCHED_FIFO;
+#ifndef __OpenBSD__
+ if (priority == -1) {
+ priority = 1;
+ }
+#endif /* !__OpenBSD__ */
+ }
+ if (priority != -1) {
+#ifdef PTHREAD_MIN_PRIORITY
+#ifdef PTHREAD_MAX_PRIORITY
+ if (priority < PTHREAD_MIN_PRIORITY) {
+ param.sched_priority = PTHREAD_MIN_PRIORITY;
+ fprintf(stderr, "Warning: %s thread priority (%d) too low, set to %d",
+ name, priority, PTHREAD_MIN_PRIORITY);
+ } else if (priority > PTHREAD_MAX_PRIORITY) {
+ param.sched_priority = PTHREAD_MAX_PRIORITY;
+ fprintf(stderr, "Warning: %s thread priority (%d) too high, set to %d",
+ name, priority, PTHREAD_MAX_PRIORITY);
+ } else
+#endif /* PTHREAD_MAX_PRIORITY */
+#endif /* PTHREAD_MIN_PRIORITY */
+ {
+ param.sched_priority = priority;
+ }
+ }
+
+ if ((x = pthread_setschedparam(thread, policy, ¶m)) != 0) {
+ fprintf(stderr,
+ "Warning: cannot use real-time scheduling for %s thread (%s/%d) "
+ "(%d: %s)\n", name, policy == SCHED_FIFO ? "FIFO" : "RR", param.sched_priority,
+ x, strerror(x));
+ }
+
+}
+
+
+#else /* !HAVE_LIBPTHREAD */
+#include <glib.h>
+
+
+void
+set_thread_priority(GThread * thread, char * name, int realtime, int priority) {
+
+ if (realtime)
+ g_thread_set_priority(thread, G_THREAD_PRIORITY_URGENT);
+
+}
+
+
+#endif /* HAVE_LIBPTHREAD */
+
+// vim: shiftwidth=8:tabstop=8:softtabstop=8:
Modified: trunk/src/athread.h
===================================================================
--- trunk/src/athread.h 2014-04-27 20:51:08 UTC (rev 1287)
+++ trunk/src/athread.h 2014-04-27 20:51:24 UTC (rev 1288)
@@ -52,6 +52,8 @@
pthread_cond_timedwait(&(cond), &(mutex), &(timeout));
#define AQUALUNG_COND_WAIT(cond, mutex) pthread_cond_wait(&(cond), &(mutex));
+void set_thread_priority(pthread_t thread, char * name, int realtime, int priority);
+
#else /* !HAVE_LIBPTHREAD */
#include <glib.h>
@@ -76,6 +78,8 @@
g_cond_timed_wait(cond, mutex, timeout);
#define AQUALUNG_COND_WAIT(cond, mutex) g_cond_wait(cond, mutex);
+void set_thread_priority(GThread * thread, char * name, int realtime, int priority);
+
#endif /* !HAVE_LIBPTHREAD */
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-04-27 20:51:08 UTC (rev 1287)
+++ trunk/src/core.c 2014-04-27 20:51:24 UTC (rev 1288)
@@ -38,8 +38,6 @@
#include <libxml/tree.h>
#ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
-#include <sched.h>
#include <time.h>
#include <sys/time.h>
#endif /* HAVE_LIBPTHREAD */
@@ -1221,63 +1219,7 @@
}
#endif /* HAVE_JACK */
-#ifndef HAVE_LIBPTHREAD
-void
-set_thread_priority(GThread * thread, char * name, int realtime, int priority) {
- if (realtime)
- g_thread_set_priority(thread, G_THREAD_PRIORITY_URGENT);
-
-}
-#else /* HAVE_LIBPTHREAD */
-void
-set_thread_priority(pthread_t thread, char * name, int realtime, int priority) {
-
- struct sched_param param;
- int policy;
- int x;
-
- if (pthread_getschedparam(thread, &policy, ¶m) != 0) {
- return;
- }
-
- if (realtime) {
- policy = SCHED_FIFO;
-#ifndef __OpenBSD__
- if (priority == -1) {
- priority = 1;
- }
-#endif /* !__OpenBSD__ */
- }
- if (priority != -1) {
-#ifdef PTHREAD_MIN_PRIORITY
-#ifdef PTHREAD_MAX_PRIORITY
- if (priority < PTHREAD_MIN_PRIORITY) {
- param.sched_priority = PTHREAD_MIN_PRIORITY;
- fprintf(stderr, "Warning: %s thread priority (%d) too low, set to %d",
- name, priority, PTHREAD_MIN_PRIORITY);
- } else if (priority > PTHREAD_MAX_PRIORITY) {
- param.sched_priority = PTHREAD_MAX_PRIORITY;
- fprintf(stderr, "Warning: %s thread priority (%d) too high, set to %d",
- name, priority, PTHREAD_MAX_PRIORITY);
- } else
-#endif /* PTHREAD_MAX_PRIORITY */
-#endif /* PTHREAD_MIN_PRIORITY */
- {
- param.sched_priority = priority;
- }
- }
-
- if ((x = pthread_setschedparam(thread, policy, ¶m)) != 0) {
- fprintf(stderr,
- "Warning: cannot use real-time scheduling for %s thread (%s/%d) "
- "(%d: %s)\n", name, policy == SCHED_FIFO ? "FIFO" : "RR", param.sched_priority,
- x, strerror(x));
- }
-
-}
-#endif /* HAVE_LIBPTHREAD */
-
#ifdef HAVE_SNDIO
/* return values:
* 0 : success
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tsz...@us...> - 2014-04-27 20:51:11
|
Revision: 1287
http://sourceforge.net/p/aqualung/code/1287
Author: tszilagyi
Date: 2014-04-27 20:51:08 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
threading: check for HAVE_LIBPTHREAD instead of _WIN32
The logic for if we use pthreads or gthread-2.0 remains the same as
it was, however, with this change, it's now easier to control as the
test is decoupled from the _WIN32 defintion.
Modified Paths:
--------------
trunk/src/athread.h
trunk/src/build_store.c
trunk/src/cdda.c
trunk/src/cddb_lookup.c
trunk/src/core.c
trunk/src/decoder/dec_cdda.c
trunk/src/export.c
trunk/src/playlist.c
trunk/src/volume.c
Modified: trunk/src/athread.h
===================================================================
--- trunk/src/athread.h 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/athread.h 2014-04-27 20:51:08 UTC (rev 1287)
@@ -21,10 +21,12 @@
#ifndef AQUALUNG_ATHREAD_H
#define AQUALUNG_ATHREAD_H
+#include <config.h>
+
#include <stddef.h>
-#ifndef _WIN32
+#ifdef HAVE_LIBPTHREAD
#include <pthread.h>
@@ -50,7 +52,7 @@
pthread_cond_timedwait(&(cond), &(mutex), &(timeout));
#define AQUALUNG_COND_WAIT(cond, mutex) pthread_cond_wait(&(cond), &(mutex));
-#else /* _WIN32 */
+#else /* !HAVE_LIBPTHREAD */
#include <glib.h>
@@ -74,7 +76,7 @@
g_cond_timed_wait(cond, mutex, timeout);
#define AQUALUNG_COND_WAIT(cond, mutex) g_cond_wait(cond, mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
#endif /* AQUALUNG_ATHREAD_H */
Modified: trunk/src/build_store.c
===================================================================
--- trunk/src/build_store.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/build_store.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -865,9 +865,9 @@
return NULL;
}
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
data->mutex = g_mutex_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
data->store_iter = *store_iter;
data->file = strdup(file);
@@ -1083,9 +1083,9 @@
void
build_store_free(build_store_t * data) {
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(data->mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
free(data->file);
Modified: trunk/src/cdda.c
===================================================================
--- trunk/src/cdda.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/cdda.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -556,9 +556,9 @@
}
cdda_notify_rb = rb_create(CDDA_NOTIFY_RB_SIZE);
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
cdda_mutex = g_mutex_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
cdda_timeout_start();
@@ -576,9 +576,9 @@
cdda_timeout_callback(NULL); /* cleanup any leftover messages */
cdda_timeout_stop();
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(cdda_mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
rb_free(cdda_notify_rb);
}
Modified: trunk/src/cddb_lookup.c
===================================================================
--- trunk/src/cddb_lookup.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/cddb_lookup.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -136,9 +136,9 @@
return NULL;
}
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
data->mutex = g_mutex_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
data->state = CDDB_INIT;
@@ -182,9 +182,9 @@
free(data->frames);
}
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(data->mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
free(data);
}
Modified: trunk/src/core.c
===================================================================
--- trunk/src/core.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/core.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -37,12 +37,12 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
-#ifndef _WIN32
+#ifdef HAVE_LIBPTHREAD
#include <pthread.h>
#include <sched.h>
#include <time.h>
#include <sys/time.h>
-#endif /* !_WIN32 */
+#endif /* HAVE_LIBPTHREAD */
#ifdef HAVE_SRC
#include <samplerate.h>
@@ -617,12 +617,12 @@
sleep:
{
/* suspend thread, wake up after 100 ms */
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
GTimeVal time;
GTimeVal * timeout = &time;
g_get_current_time(timeout);
g_time_val_add(timeout, 100000);
-#else
+#else /* HAVE_LIBPTHREAD */
struct timeval now;
struct timezone tz;
struct timespec timeout;
@@ -633,7 +633,7 @@
timeout.tv_nsec -= 1000000000;
timeout.tv_sec += 1;
}
-#endif /* _WIN32 */
+#endif /* HAVE_LIBPTHREAD */
AQUALUNG_COND_TIMEDWAIT(disk_thread_wake, disk_thread_lock, timeout)
}
}
@@ -1221,7 +1221,7 @@
}
#endif /* HAVE_JACK */
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
void
set_thread_priority(GThread * thread, char * name, int realtime, int priority) {
@@ -1229,7 +1229,7 @@
g_thread_set_priority(thread, G_THREAD_PRIORITY_URGENT);
}
-#else
+#else /* HAVE_LIBPTHREAD */
void
set_thread_priority(pthread_t thread, char * name, int realtime, int priority) {
@@ -1276,7 +1276,7 @@
}
}
-#endif /* _WIN32 */
+#endif /* HAVE_LIBPTHREAD */
#ifdef HAVE_SNDIO
/* return values:
@@ -2495,10 +2495,10 @@
gdk_threads_init();
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
disk_thread_lock = g_mutex_new();
disk_thread_wake = g_cond_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
file_decoder_init();
@@ -3249,10 +3249,10 @@
}
#endif /* HAVE_WINMM */
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(disk_thread_lock);
g_cond_free(disk_thread_wake);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
if (device_name != NULL)
free(device_name);
Modified: trunk/src/decoder/dec_cdda.c
===================================================================
--- trunk/src/decoder/dec_cdda.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/decoder/dec_cdda.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -221,9 +221,9 @@
cdda_decoder_init(file_decoder_t * fdec) {
decoder_t * dec = NULL;
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
cdda_pdata_t * pd = NULL;
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
if ((dec = calloc(1, sizeof(decoder_t))) == NULL) {
fprintf(stderr, "dec_cdda.c: cdda_decoder_new() failed: calloc error\n");
@@ -244,10 +244,10 @@
dec->close = cdda_decoder_close;
dec->read = cdda_decoder_read;
dec->seek = cdda_decoder_seek;
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
pd = (cdda_pdata_t *)dec->pdata;
pd->cdda_reader_mutex = g_mutex_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
return dec;
}
@@ -256,10 +256,10 @@
void
cdda_decoder_destroy(decoder_t * dec) {
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
cdda_pdata_t * pd = (cdda_pdata_t *)dec->pdata;
g_mutex_free(pd->cdda_reader_mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
free(dec->pdata);
free(dec);
}
Modified: trunk/src/export.c
===================================================================
--- trunk/src/export.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/export.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -203,9 +203,9 @@
return NULL;
}
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
export->mutex = g_mutex_new();
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
return export;
}
@@ -226,9 +226,9 @@
GSList * node;
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(export->mutex);
-#endif /* _WIN32 */
+#endif /* !HAVE_LIBPTHREAD */
for (node = export->slist; node; node = node->next) {
export_item_free((export_item_t *)node->data);
Modified: trunk/src/playlist.c
===================================================================
--- trunk/src/playlist.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/playlist.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -363,11 +363,11 @@
AQUALUNG_COND_INIT(pl->thread_wait);
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
pl->thread_mutex = g_mutex_new();
pl->wait_mutex = g_mutex_new();
pl->thread_wait = g_cond_new();
-#endif
+#endif /* !HAVE_LIBPTHREAD */
if (name != NULL) {
strncpy(pl->name, name, MAXLEN-1);
@@ -388,11 +388,11 @@
playlists = g_list_remove(playlists, pl);
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(pl->thread_mutex);
g_mutex_free(pl->wait_mutex);
g_cond_free(pl->thread_wait);
-#endif
+#endif /* !HAVE_LIBPTHREAD */
free(pl);
}
Modified: trunk/src/volume.c
===================================================================
--- trunk/src/volume.c 2014-04-27 20:50:41 UTC (rev 1286)
+++ trunk/src/volume.c 2014-04-27 20:51:08 UTC (rev 1287)
@@ -77,11 +77,11 @@
AQUALUNG_COND_INIT(vol->thread_wait);
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
vol->thread_mutex = g_mutex_new();
vol->wait_mutex = g_mutex_new();
vol->thread_wait = g_cond_new();
-#endif
+#endif /* !HAVE_LIBPTHREAD */
return vol;
}
@@ -112,11 +112,11 @@
void
volume_free(volume_t * vol) {
-#ifdef _WIN32
+#ifndef HAVE_LIBPTHREAD
g_mutex_free(vol->thread_mutex);
g_mutex_free(vol->wait_mutex);
g_cond_free(vol->thread_wait);
-#endif
+#endif /* !HAVE_LIBPTHREAD */
if (vol->volumes != NULL) {
free(vol->volumes);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|