many fixes to audio file code, SMPTE offset now works correctly

git-svn-id: svn://localhost/ardour2/trunk@649 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-06-28 22:00:09 +00:00
parent fdda19d3d4
commit 728835e5e7
22 changed files with 351 additions and 318 deletions

View file

@ -838,6 +838,11 @@ if env['NLS']:
print 'This system is not configured for internationalized applications (no libintl.h). An english-only version will be built\n'
env['NLS'] = 0
have_intltool = conf.TryAction(Action('intltool-update --version'))
if have_intltool[0] != 1:
print 'This system is not configured for internationalized applications (no intltool-update command). An english-only version will be built\n'
env['NLS'] = 0
env = conf.Finish()

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtk-ardour 0.347.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2003-05-11 17:36+0200\n"
"Last-Translator: Karsten Petersen <kapet@kapet.de>\n"
"Language-Team: Deutsch <de@li.org>\n"
@ -4773,29 +4773,29 @@ msgstr ""
msgid "%d(%d): received signal %d\n"
msgstr ""
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr ""
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr ""
#: main.cc:254
#: main.cc:248
msgid ""
"Without a UI style file, ardour will look strange.\n"
" Please set ARDOUR2_UI_RC to point to a valid UI style file"
msgstr ""
#: main.cc:276
#: main.cc:270
msgid "Ardour could not connect to JACK."
msgstr ""
#: main.cc:280
#: main.cc:274
msgid ""
"There are several possible reasons:\n"
"\n"
@ -4806,12 +4806,12 @@ msgid ""
"Please consider the possibilities, and perhaps (re)start JACK."
msgstr ""
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr ""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4819,7 +4819,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4827,60 +4827,60 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr ""
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
msgid " with libardour "
msgstr ""
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr ""
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Achtung: Es gibt zu Ardour KEINERLEI Gewährleistung!"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Dies ist freie Software und Sie dürfen sie gerne weiterverbreiten,"
#: main.cc:432
#: main.cc:426
#, fuzzy
msgid "under certain conditions; see the source for copying conditions."
msgstr "solange Sie sich an die Spielregeln aus der Datei COPYING halten."
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr ""
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr ""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr ""

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.99beta23\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2005-01-11\n"
"Last-Translator: Muadibas <EMAIL@ADDRESS>\n"
"Language-Team: Hellenic(Greek) <LL@li.org>\n"
@ -4776,19 +4776,19 @@ msgstr "παύση του user interface\n"
msgid "%d(%d): received signal %d\n"
msgstr "%d: εδέχθη σήμα %d\n"
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr "δεν γίνεται να διαμορφώθεί η διαχείρηση σημάτων για %1"
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr "δεν γίνεται να διαμορφώθεί η προκαθορισμένη μάσκα σημάτων (%1)"
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4797,12 +4797,12 @@ msgstr ""
"Δίχως αρχείο εμφάνισεως UI, ο ardour θα φαίνεται παράξενα.\n"
"Παρακαλώ θέστε το ARDOUR_UI_RC να δείχνει σε ενεργό αρχείο εμφανίσεως UI"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "Δεν γινόταν να συνδεθώ στον JACK server σαν \"%1\""
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4822,12 +4822,12 @@ msgstr ""
"\n"
"Παρακαλώ αναλογιστείτε τις πιθανότητες, και ίσως (ξανα)ξεκινήστε τον JACK."
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "δεν γινόταν να φορτωθεί η συνεδρία γραμμής εντολών \"%1\""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4835,7 +4835,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4843,63 +4843,63 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr "Ardour/GTK "
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " τρέχοντας με libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
#, fuzzy
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr "Πνευματικα Δικαιώματα 1999-2004 Paul Davis"
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ο Ardour έρχεται με απολύτως ΚΑΜΙΑ ΕΓΓΥΗΣΗ"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr ""
"Το παρόν είναι ελεύθερο λογισμικό, είστε ελεύθεροι να το επαναδιανείμετε "
#: main.cc:432
#: main.cc:426
#, fuzzy
msgid "under certain conditions; see the source for copying conditions."
msgstr "υπό ορισμένους όρους, ανατρέξτε στο αρχείο COPYING για λεπτομέρειες"
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "δεν γινόταν να δημιουργηθεί ARDOUR GUI"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "Δεν γινόταν να συνδεθώ στον JACK server σαν \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "δεν γινόταν να εκκινηθεί ο Ardour."

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ardour 0.688.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2004-01-21 12:45+0100\n"
"Last-Translator: Alex Krohn <alexkrohn@fastmail.fm>\n"
"Language-Team: Spanish\n"
@ -4827,19 +4827,19 @@ msgstr "deteniendo interfase visual\n"
msgid "%d(%d): received signal %d\n"
msgstr ""
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr ""
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr ""
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4848,12 +4848,12 @@ msgstr ""
"Sin un archivo de interfase visual, Ardour no se \n"
"ver�correctamente. Apunte ARDOUR_UI_RC a un archivo v�ido"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "No se pudo conectar a JACK con el nombre \"%1\""
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4873,12 +4873,12 @@ msgstr ""
"\n"
"Considere estas posibilidades y o reinicie a JACK.\n"
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "no se pudo cargar desde l�ea de comando a la sesin \"%1\""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4886,7 +4886,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4894,61 +4894,61 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr ""
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " corriendo con libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr ""
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ardour no ofrece ningn tipo de garant�"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Este software es gratuito.Usted puede distribuirlo "
#: main.cc:432
#: main.cc:426
#, fuzzy
msgid "under certain conditions; see the source for copying conditions."
msgstr "bajo ciertas condiciones; lea el archivo COPYING para m� detalles"
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "no se pudo crear la interfase visual de Ardour"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "No se pudo conectar a JACK con el nombre \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "no se pudo iniciar a Ardour."

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtk-ardour 0.334.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2005-02-14 11:19-0500\n"
"Last-Translator: Alain Fréhel <alain.frehel@free.fr>\n"
"Language-Team: French <ardour-dev@lists.sourceforge.net>\n"
@ -4809,19 +4809,19 @@ msgstr "en train d'arrêter l'interface utilisateur\n"
msgid "%d(%d): received signal %d\n"
msgstr "%d(%d) : reçu le signal %d\n"
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr "impossible d'installer le gestionnaire de signaux pour %1"
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr "impossible de définir le masque de signalisation"
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4830,12 +4830,12 @@ msgstr ""
"Sans un fichier de style pour son IHM, ardour aura une apparence bizarre.\n"
"Veuillez faire pointer ARDOUR_UI_RC vers un fichier de style d'IHM valide"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "Impossible de se reconnecter à JACK"
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4855,12 +4855,12 @@ msgstr ""
"\n"
"Veuillez étudier les possibilités, et peut-être (re)lancer JACK."
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "impossible de charger la session indiqué en ligne de commande \"%1\""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4872,7 +4872,7 @@ msgstr ""
"Une session nommé \"%1\" existe déjà.\n"
"Pour éviter ce message, lancez ardour comme cela : \"ardour %1"
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4885,11 +4885,11 @@ msgstr ""
"Pour la créer depuis la ligne de commande, lancez ardour comme cela : "
"\"ardour --new %1"
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr "Ardour/GTK"
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
@ -4897,20 +4897,20 @@ msgstr ""
"\n"
" (fonctionnant avec "
#: main.cc:411
#: main.cc:405
msgid " with libardour "
msgstr " avec libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
#, fuzzy
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr "Copyright (C) 1999-2005 Paul Davis"
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
@ -4918,33 +4918,33 @@ msgstr ""
"Certaines parties Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ardour est distribué sans AUCUNE GARANTIE"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr "ni même pour la COMMERCIALISATION ou pour UN BUT PARTICULIER."
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Ceci est un logiciel libre, et vous êtes encouragé à le distribuer "
#: main.cc:432
#: main.cc:426
msgid "under certain conditions; see the source for copying conditions."
msgstr ""
"sous certaines conditions ; voir le fichier source pour les conditions de "
"distribution."
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "impossible de créer l'interface utilisateur d'ARDOUR"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "Impossible de se connecter au serveur JACK en tant que \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "impossible d'initialiser Ardour."

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ardour 0.354.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2003-05-20 13:03-0500\n"
"Last-Translator: Filippo Pappalardo <filippo@email.it>\n"
"Language-Team: Italian\n"
@ -4727,19 +4727,19 @@ msgstr "chiusura dell'interfaccia\n"
msgid "%d(%d): received signal %d\n"
msgstr "%d: ricevuto segnale %d\n"
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr ""
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr ""
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4748,11 +4748,11 @@ msgstr ""
"Senza uno Stile per l'Interfaccia, ardour apparirà strano\n"
"Impostare la variabile ARDOUR_UI_RC per puntare ad uno Stile"
#: main.cc:276
#: main.cc:270
msgid "Ardour could not connect to JACK."
msgstr ""
#: main.cc:280
#: main.cc:274
msgid ""
"There are several possible reasons:\n"
"\n"
@ -4763,12 +4763,12 @@ msgid ""
"Please consider the possibilities, and perhaps (re)start JACK."
msgstr ""
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "Impossibile caricare la sessione \"%1\" da linea di comando"
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4776,7 +4776,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4784,60 +4784,60 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr ""
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " con libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr ""
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr ""
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr ""
#: main.cc:432
#: main.cc:426
msgid "under certain conditions; see the source for copying conditions."
msgstr ""
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "Impossibile creare l'interfaccia di Ardour"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr ""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "impossibile avviare Ardour"

View file

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ardour 0.688.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2005-08-15 21:50-0000\n"
"Last-Translator: Chris Ross, Alexander Franca & Leandro Marco\n"
"Language-Team: Portuguese\n"
@ -4779,19 +4779,19 @@ msgstr "interrompendo a interface do usuário\n"
msgid "%d(%d): received signal %d\n"
msgstr ""
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr ""
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr ""
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4800,12 +4800,12 @@ msgstr ""
"Sem um arquivo de estilo o ardour vai ficar meio esquisito.\n"
"Por favor, configure a variável ambiente ARDOUR_UI_RC para um arquivo válido"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "Não foi possível se conectar ao servidor JACK"
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4825,12 +4825,12 @@ msgstr ""
"\n"
"Por favor, considere essas razões, e talvez (re)inicie o JACK."
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "não foi possível carregar a sessão da linha de comando \"%1\""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4838,7 +4838,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4846,60 +4846,60 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr ""
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " executando com libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr ""
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ardour não oferece ABSOLUTAMENTE NENHUMA GARANTIA"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Isto é um Software Livre. Fique à vontade para redistribuí-lo "
#: main.cc:432
#: main.cc:426
msgid "under certain conditions; see the source for copying conditions."
msgstr "com algumas condições; veja o fonte para mais detalhes"
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "não foi possível criar a INTERFACE ARDOUR"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "Não foi possível se conectar ao servidor JACK com \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "não foi possível iniciar o Ardour."

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.814.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2004-12-07 13:00+0000\n"
"Last-Translator: Rui Nuno Capela <rncbc@rncbc.org>\n"
"Language-Team: Portuguese\n"
@ -4768,19 +4768,19 @@ msgstr "interface homem-máquina em fase terminal\n"
msgid "%d(%d): received signal %d\n"
msgstr "%d: sinal %d recebido\n"
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr "não foi possível estabelecer receptor de sinal %1"
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr "não foi possível estabelecer máscara de sinal %1"
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4791,12 +4791,12 @@ msgstr ""
"Por favor, indique um ficheiro de estilo visual válido em ARDOUR_UI_RC "
"(variável de ambiente)"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "Não foi possível conectar ao serviço JACK como \"%1\""
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4816,12 +4816,12 @@ msgstr ""
"\n"
"Por favor, considere estas possibilidades e (re)inicie o serviço JACK."
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "não foi possível carregar a sessão de linha de comando \"%1\""
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4829,7 +4829,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4837,63 +4837,63 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr ""
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " em execução com libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr ""
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ardour é fornecido ABSOLUTAMENTE SEM QUALQUER GARANTIA"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Sendo software livre, é permitida e até encorajada a sua distribuição"
#: main.cc:432
#: main.cc:426
#, fuzzy
msgid "under certain conditions; see the source for copying conditions."
msgstr ""
"desde que sejam respeitadas algumas condições; para mais informações, leia "
"por favor o ficheiro COPYING."
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "não foi possível criar o interface gráfico (GUI)"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "Não foi possível conectar ao serviço JACK como \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "não foi possível inicializar o Ardour"

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gtk-ardour 0.413.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 18:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2004-03-31 00:45+0300\n"
"Last-Translator: Igor Blinov pitstop@nm.ru\n"
"Language-Team: Russian\n"
@ -4795,19 +4795,19 @@ msgstr "завершение работы...\n"
msgid "%d(%d): received signal %d\n"
msgstr "%d: принят сигнал %d\n"
#: main.cc:186
#: main.cc:180
msgid "cannot become new process group leader (%1)"
msgstr ""
#: main.cc:213
#: main.cc:207
msgid "cannot setup signal handling for %1"
msgstr "cannot setup signal handling for %1"
#: main.cc:224
#: main.cc:218
msgid "cannot set default signal mask (%1)"
msgstr "cannot set default signal mask (%1)"
#: main.cc:254
#: main.cc:248
#, fuzzy
msgid ""
"Without a UI style file, ardour will look strange.\n"
@ -4817,12 +4817,12 @@ msgstr ""
"без файла определяющего стиль отображения.\n"
"Пожалуйста, укажите его (файл) в переменной окружения ARDOUR_UI_RC"
#: main.cc:276
#: main.cc:270
#, fuzzy
msgid "Ardour could not connect to JACK."
msgstr "Не удалось соединиться с сервером JACK как \"%1\""
#: main.cc:280
#: main.cc:274
#, fuzzy
msgid ""
"There are several possible reasons:\n"
@ -4842,12 +4842,12 @@ msgstr ""
"\n"
"Пожалуйста, проверьте все варианты, возможно потребуется (пере)запуск JACK."
#: main.cc:310
#: main.cc:304
msgid "could not load command line session \"%1\""
msgstr "не удалось загрузить сессию \"%1\", указанную в командной строке"
#. it wasn't new, but we require a new session
#: main.cc:330
#: main.cc:324
msgid ""
"\n"
"\n"
@ -4855,7 +4855,7 @@ msgid ""
"To avoid this message, start ardour as \"ardour %1"
msgstr ""
#: main.cc:341
#: main.cc:335
msgid ""
"\n"
"\n"
@ -4863,62 +4863,62 @@ msgid ""
"To create it from the command line, start ardour as \"ardour --new %1"
msgstr ""
#: main.cc:405
#: main.cc:399
msgid "Ardour/GTK "
msgstr "Ardour/GTK "
#: main.cc:407
#: main.cc:401
msgid ""
"\n"
" (built using "
msgstr ""
#: main.cc:411
#: main.cc:405
#, fuzzy
msgid " with libardour "
msgstr " работает с libardour "
#: main.cc:416
#: main.cc:410
msgid " and GCC version "
msgstr ""
#: main.cc:426
#: main.cc:420
#, fuzzy
msgid "Copyright (C) 1999-2006 Paul Davis"
msgstr "Авторское право 1999-2004 Paul Davis"
#: main.cc:427
#: main.cc:421
msgid ""
"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
"Baker"
msgstr ""
#: main.cc:429
#: main.cc:423
msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
msgstr "Ardour распространяется БЕЗ ВСЯКИХ ГАРАНТИЙ"
#: main.cc:430
#: main.cc:424
msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: main.cc:431
#: main.cc:425
msgid "This is free software, and you are welcome to redistribute it "
msgstr "Это свободное программное обеспечение, Вы можете распространять его"
#: main.cc:432
#: main.cc:426
#, fuzzy
msgid "under certain conditions; see the source for copying conditions."
msgstr "на определённых условиях; подробнее об этом читайте в файле COPYING."
#: main.cc:441
#: main.cc:435
msgid "could not create ARDOUR GUI"
msgstr "не удалось создать графический интерфейс для ARDOUR"
#: main.cc:459
#: main.cc:453
msgid "Could not connect to JACK server as \"%1\""
msgstr "Не удалось соединиться с сервером JACK как \"%1\""
#: main.cc:462
#: main.cc:456
msgid "could not initialize Ardour."
msgstr "не удалось запустить Ardour."

View file

@ -42,7 +42,7 @@ class AudioFileSource : public AudioSource {
Removable = 0x8,
RemovableIfEmpty = 0x10,
RemoveAtDestroy = 0x20,
BuildPeaks = 0x40
NoPeakFile = 0x40
};
virtual ~AudioFileSource ();
@ -62,7 +62,7 @@ class AudioFileSource : public AudioSource {
cannot.
*/
static AudioFileSource* create (const string& path_plus_channel);
static AudioFileSource* create (const string& path_plus_channel, Flag flags = Flag (0));
static AudioFileSource* create (const XMLNode&);
static bool get_soundfile_info (string path, SoundFileInfo& _info, string& error);
@ -97,7 +97,7 @@ class AudioFileSource : public AudioSource {
static void set_search_path (string);
static void set_header_position_offset (jack_nframes_t offset, bool negative);
static sigc::signal<void,struct tm*, time_t> HeaderPositionOffsetChanged;
static sigc::signal<void> HeaderPositionOffsetChanged;
XMLNode& get_state ();
int set_state (const XMLNode&);
@ -107,7 +107,7 @@ class AudioFileSource : public AudioSource {
to cause issues.
*/
void handle_header_position_change (struct tm*, time_t tnow);
void handle_header_position_change ();
protected:

View file

@ -32,8 +32,7 @@ namespace ARDOUR {
class DestructiveFileSource : public SndFileSource {
public:
DestructiveFileSource (std::string path, SampleFormat samp_format, HeaderFormat hdr_format, jack_nframes_t rate,
Flag flags = AudioFileSource::Flag (AudioFileSource::Writable|
AudioFileSource::BuildPeaks));
Flag flags = AudioFileSource::Flag (AudioFileSource::Writable));
DestructiveFileSource (const XMLNode&);
~DestructiveFileSource ();

View file

@ -39,8 +39,7 @@ class SndFileSource : public AudioFileSource {
Flag flags = AudioFileSource::Flag (AudioFileSource::Writable|
AudioFileSource::Removable|
AudioFileSource::RemovableIfEmpty|
AudioFileSource::CanRename|
AudioFileSource::BuildPeaks));
AudioFileSource::CanRename));
/* constructor to be called for existing in-session files */
@ -52,7 +51,7 @@ class SndFileSource : public AudioFileSource {
int update_header (jack_nframes_t when, struct tm&, time_t);
int flush_header ();
static Flag default_in_session_flags();
void handle_smpte_offset_change (jack_nframes_t offset, bool negative);
protected:
void set_header_timeline_position ();

View file

@ -1754,6 +1754,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
srcs.push_back (s);
if ((fsrc = dynamic_cast<AudioFileSource *>(s)) != 0) {
cerr << "updating source after capture\n";
fsrc->update_header (capture_info.front()->start, when, twhen);
}

View file

@ -94,14 +94,6 @@ AudioTrack::~AudioTrack ()
}
}
#if 0
void
AudioTrack::handle_smpte_offset_change ()
{
diskstream
}
#endif
int
AudioTrack::deprecated_use_diskstream_connections ()
{

View file

@ -55,7 +55,7 @@ using namespace PBD;
string AudioFileSource::peak_dir = "";
string AudioFileSource::search_path;
sigc::signal<void,struct tm*, time_t> AudioFileSource::HeaderPositionOffsetChanged;
sigc::signal<void> AudioFileSource::HeaderPositionOffsetChanged;
bool AudioFileSource::header_position_negative;
uint64_t AudioFileSource::header_position_offset;
@ -122,7 +122,6 @@ AudioFileSource::init (string pathstr, bool must_exist)
next_peak_clear_should_notify = false;
if (!find (pathstr, must_exist, is_new)) {
cerr << "cannot find " << pathstr << " with me = " << must_exist << endl;
return -1;
}
@ -211,16 +210,16 @@ AudioFileSource::create (const XMLNode& node)
#ifdef HAVE_COREAUDIO
AudioFileSource*
AudioFileSource::create (const string& idstr)
AudioFileSource::create (const string& idstr, Flag flags)
{
AudioFileSource* es = 0;
try {
es = new CoreAudioSource (idstr, Flag(0x0));
es = new CoreAudioSource (idstr, flags);
}
catch (failed_constructor& err) {
es = new SndFileSource (idstr, Flag(0x0));
es = new SndFileSource (idstr, flags);
}
return es;
@ -229,9 +228,9 @@ AudioFileSource::create (const string& idstr)
#else
AudioFileSource*
AudioFileSource::create (const string& idstr)
AudioFileSource::create (const string& idstr, Flag flags)
{
return new SndFileSource (idstr, Flag(0x0));
return new SndFileSource (idstr, flags);
}
#endif // HAVE_COREAUDIO
@ -595,13 +594,19 @@ AudioFileSource::set_search_path (string p)
void
AudioFileSource::set_header_position_offset (jack_nframes_t offset, bool negative)
{
time_t tnow;
time (&tnow);
header_position_offset = offset;
header_position_negative = negative;
HeaderPositionOffsetChanged (localtime (&tnow), tnow); /* EMIT SIGNAL */
HeaderPositionOffsetChanged ();
}
void
AudioFileSource::handle_header_position_change ()
{
if (writable()) {
set_header_timeline_position ();
flush_header ();
}
}
void
@ -610,17 +615,6 @@ AudioFileSource::set_timeline_position (jack_nframes_t pos)
timeline_position = pos;
}
void
AudioFileSource::handle_header_position_change (struct tm* now, time_t tnow)
{
/* don't do this if the file has never had its header flushed to disk yet */
if (writable() && _timestamp) {
set_header_timeline_position ();
flush_header ();
}
}
void
AudioFileSource::set_allow_remove_if_empty (bool yn)
{
@ -655,8 +649,14 @@ AudioFileSource::set_name (string newname, bool destructive)
bool
AudioFileSource::is_empty (string path)
{
/* XXX fix me */
bool ret = false;
AudioFileSource* afs = create (path, NoPeakFile);
return false;
if (afs) {
ret = (afs->length() == 0);
delete afs;
}
return ret;
}

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libardour 0.664.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 15:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2003-05-21 12:50+0500\n"
"Last-Translator: Muadibas\n"
"Language-Team: Hellenic(Greek)\n"
@ -198,77 +198,77 @@ msgid "programming error: AudioTrack given state without diskstream!"
msgstr ""
"σφάλμα προγραμματισμού: εδόθη κατάσταση στην AudioTrack δίχως diskstream!"
#: libs/ardour/audioengine.cc:150
#: libs/ardour/audioengine.cc:144
msgid "cannot activate JACK client"
msgstr "Ο JACK δεν μπορεί να ενεργοποιηθεί"
#: libs/ardour/audioengine.cc:401
#: libs/ardour/audioengine.cc:395
msgid "register audio input port called before engine was started"
msgstr "η register audio input port εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:432
#: libs/ardour/audioengine.cc:426
msgid "register audio output port called before engine was started"
msgstr "η register audio output port εκλήθη πρίν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:493
#: libs/ardour/audioengine.cc:487
msgid "connect called before engine was started"
msgstr "η σύνδεση εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:509
#: libs/ardour/audioengine.cc:503
msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
msgstr ""
#: libs/ardour/audioengine.cc:522 libs/ardour/audioengine.cc:551
#: libs/ardour/audioengine.cc:516 libs/ardour/audioengine.cc:545
msgid "disconnect called before engine was started"
msgstr "η αποσύνδεση εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:609
#: libs/ardour/audioengine.cc:603
msgid "get_port_by_name() called before engine was started"
msgstr "η ρουτίνα get_port_by_name() εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:642
#: libs/ardour/audioengine.cc:636
msgid "get_ports called before engine was started"
msgstr "η ρουτίνα get_ports εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:717
#: libs/ardour/audioengine.cc:711
msgid "get_nth_physical called before engine was started"
msgstr "η ρουτίνα get_nth_physical εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:745
#: libs/ardour/audioengine.cc:739
#, fuzzy
msgid "get_port_total_latency() called with no JACK client connection"
msgstr "η ρουτίνα get_port_total_latency() εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:751
#: libs/ardour/audioengine.cc:745
msgid "get_port_total_latency() called before engine was started"
msgstr "η ρουτίνα get_port_total_latency() εκλήθη πριν να εκκινηθεί η engine"
#: libs/ardour/audioengine.cc:875
#: libs/ardour/audioengine.cc:869
msgid "Unable to connect to JACK server"
msgstr ""
#: libs/ardour/audioengine.cc:878
#: libs/ardour/audioengine.cc:872
msgid "Could not connect to JACK server as \"%1\""
msgstr ""
#: libs/ardour/audioengine.cc:883
#: libs/ardour/audioengine.cc:877
msgid "JACK server started"
msgstr ""
#: libs/ardour/audioengine.cc:917
#: libs/ardour/audioengine.cc:911
msgid "cannot shutdown connection to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:942
#: libs/ardour/audioengine.cc:936
msgid "failed to connect to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:958
#: libs/ardour/audioengine.cc:952
#, fuzzy
msgid "could not reregister %1"
msgstr "Σφάλμα: δεν μπόρεσα να γράψω %1"
#: libs/ardour/audioengine.cc:1015
#: libs/ardour/audioengine.cc:1009
msgid "could not reconnect %1 and %2 (err = %3)"
msgstr ""

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libardour 0.664.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 15:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2003-05-21 12:50+0500\n"
"Last-Translator: Filippo Pappalardo <filippo@email.it>\n"
"Language-Team: Italian\n"
@ -183,88 +183,88 @@ msgstr ""
msgid "programming error: AudioTrack given state without diskstream!"
msgstr ""
#: libs/ardour/audioengine.cc:150
#: libs/ardour/audioengine.cc:144
msgid "cannot activate JACK client"
msgstr "impossibile attivare il client JACK"
#: libs/ardour/audioengine.cc:401
#: libs/ardour/audioengine.cc:395
msgid "register audio input port called before engine was started"
msgstr ""
"la richiesta di registrazione di una porta di entrata avvenuta prima "
"dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:432
#: libs/ardour/audioengine.cc:426
msgid "register audio output port called before engine was started"
msgstr ""
"la richiesta di registrazione di una porta di uscita avvenuta prima "
"dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:493
#: libs/ardour/audioengine.cc:487
msgid "connect called before engine was started"
msgstr "richiesta di connessione avvenuta prima dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:509
#: libs/ardour/audioengine.cc:503
msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
msgstr ""
#: libs/ardour/audioengine.cc:522 libs/ardour/audioengine.cc:551
#: libs/ardour/audioengine.cc:516 libs/ardour/audioengine.cc:545
msgid "disconnect called before engine was started"
msgstr ""
"richiesta di disconnessione avvenuta prima dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:609
#: libs/ardour/audioengine.cc:603
msgid "get_port_by_name() called before engine was started"
msgstr ""
"richiesta get_port_by_name() avvenuta prima dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:642
#: libs/ardour/audioengine.cc:636
msgid "get_ports called before engine was started"
msgstr "richiesta di get_ports avvenuta prima dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:717
#: libs/ardour/audioengine.cc:711
msgid "get_nth_physical called before engine was started"
msgstr ""
"richiesta di get_nth_physical avvenuta prima dell'avvio dell'applicazione"
#: libs/ardour/audioengine.cc:745
#: libs/ardour/audioengine.cc:739
#, fuzzy
msgid "get_port_total_latency() called with no JACK client connection"
msgstr ""
"richiesta di get_port_total_latency() avvenuta prima dell'avvio "
"dell'applicazione"
#: libs/ardour/audioengine.cc:751
#: libs/ardour/audioengine.cc:745
msgid "get_port_total_latency() called before engine was started"
msgstr ""
"richiesta di get_port_total_latency() avvenuta prima dell'avvio "
"dell'applicazione"
#: libs/ardour/audioengine.cc:875
#: libs/ardour/audioengine.cc:869
msgid "Unable to connect to JACK server"
msgstr ""
#: libs/ardour/audioengine.cc:878
#: libs/ardour/audioengine.cc:872
msgid "Could not connect to JACK server as \"%1\""
msgstr ""
#: libs/ardour/audioengine.cc:883
#: libs/ardour/audioengine.cc:877
msgid "JACK server started"
msgstr ""
#: libs/ardour/audioengine.cc:917
#: libs/ardour/audioengine.cc:911
msgid "cannot shutdown connection to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:942
#: libs/ardour/audioengine.cc:936
msgid "failed to connect to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:958
#: libs/ardour/audioengine.cc:952
#, fuzzy
msgid "could not reregister %1"
msgstr "Esportazione: impossibile scrivere dati sul file di output (%1)"
#: libs/ardour/audioengine.cc:1015
#: libs/ardour/audioengine.cc:1009
msgid "could not reconnect %1 and %2 (err = %3)"
msgstr ""

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libardour 0.716.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-21 15:09-0400\n"
"POT-Creation-Date: 2006-06-27 13:00-0400\n"
"PO-Revision-Date: 2004-03-31 00:55+0300\n"
"Last-Translator: Igor Blinov pitstop@nm.ru\n"
"Language-Team: Russian\n"
@ -171,75 +171,75 @@ msgstr ""
msgid "programming error: AudioTrack given state without diskstream!"
msgstr ""
#: libs/ardour/audioengine.cc:150
#: libs/ardour/audioengine.cc:144
msgid "cannot activate JACK client"
msgstr "ÎÅ ÕÄÁÌÏÓØ ÁËÔÉ×ÉÒÏ×ÁÔØ ËÌÉÅÎÔÁ JACK ÓÅÒ×ÅÒÁ"
#: libs/ardour/audioengine.cc:401
#: libs/ardour/audioengine.cc:395
msgid "register audio input port called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:432
#: libs/ardour/audioengine.cc:426
msgid "register audio output port called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:493
#: libs/ardour/audioengine.cc:487
msgid "connect called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:509
#: libs/ardour/audioengine.cc:503
msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
msgstr ""
#: libs/ardour/audioengine.cc:522 libs/ardour/audioengine.cc:551
#: libs/ardour/audioengine.cc:516 libs/ardour/audioengine.cc:545
msgid "disconnect called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:609
#: libs/ardour/audioengine.cc:603
msgid "get_port_by_name() called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:642
#: libs/ardour/audioengine.cc:636
msgid "get_ports called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:717
#: libs/ardour/audioengine.cc:711
msgid "get_nth_physical called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:745
#: libs/ardour/audioengine.cc:739
msgid "get_port_total_latency() called with no JACK client connection"
msgstr ""
#: libs/ardour/audioengine.cc:751
#: libs/ardour/audioengine.cc:745
msgid "get_port_total_latency() called before engine was started"
msgstr ""
#: libs/ardour/audioengine.cc:875
#: libs/ardour/audioengine.cc:869
msgid "Unable to connect to JACK server"
msgstr ""
#: libs/ardour/audioengine.cc:878
#: libs/ardour/audioengine.cc:872
msgid "Could not connect to JACK server as \"%1\""
msgstr ""
#: libs/ardour/audioengine.cc:883
#: libs/ardour/audioengine.cc:877
msgid "JACK server started"
msgstr ""
#: libs/ardour/audioengine.cc:917
#: libs/ardour/audioengine.cc:911
msgid "cannot shutdown connection to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:942
#: libs/ardour/audioengine.cc:936
msgid "failed to connect to JACK"
msgstr ""
#: libs/ardour/audioengine.cc:958
#: libs/ardour/audioengine.cc:952
msgid "could not reregister %1"
msgstr ""
#: libs/ardour/audioengine.cc:1015
#: libs/ardour/audioengine.cc:1009
msgid "could not reconnect %1 and %2 (err = %3)"
msgstr ""

View file

@ -109,7 +109,6 @@ Session::set_smpte_offset_negative (bool neg)
SMPTEOffsetChanged (); /* EMIT SIGNAL */
}
void
Session::smpte_to_sample( SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes ) const
{

View file

@ -55,6 +55,7 @@ SndFileSource::SndFileSource (const XMLNode& node)
}
SndFileSource::SndFileSource (string idstr, Flag flags)
/* files created this way are never writable or removable */
: AudioFileSource (idstr, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
{
init (idstr);
@ -63,7 +64,7 @@ SndFileSource::SndFileSource (string idstr, Flag flags)
throw failed_constructor ();
}
if (_build_peakfiles) {
if (!(_flags & NoPeakFile) && _build_peakfiles) {
if (initialize_peakfile (false, _path)) {
sf_close (sf);
sf = 0;
@ -170,9 +171,10 @@ SndFileSource::SndFileSource (string idstr, SampleFormat sfmt, HeaderFormat hf,
delete _broadcast_info;
_broadcast_info = 0;
}
}
if (_build_peakfiles) {
if (!(_flags & NoPeakFile) && _build_peakfiles) {
if (initialize_peakfile (true, _path)) {
sf_close (sf);
sf = 0;
@ -180,12 +182,6 @@ SndFileSource::SndFileSource (string idstr, SampleFormat sfmt, HeaderFormat hf,
}
}
/* since SndFileSource's constructed with this constructor can be writable, make sure we update if the header info changes */
if (writable()) {
HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioFileSource::handle_header_position_change));
}
AudioSourceCreated (this); /* EMIT SIGNAL */
}
@ -235,34 +231,56 @@ SndFileSource::open ()
_length = _info.frames;
_broadcast_info = (SF_BROADCAST_INFO*) calloc (1, sizeof (SF_BROADCAST_INFO));
/* lookup broadcast info */
if (sf_command (sf, SFC_GET_BROADCAST_INFO, _broadcast_info, sizeof (*_broadcast_info)) != SF_TRUE) {
/* if the file has data but no broadcast info, then clearly, there is no broadcast info */
if (_length) {
free (_broadcast_info);
_broadcast_info = 0;
_flags = Flag (_flags & ~Broadcast);
}
} else {
/* XXX 64 bit alert: when JACK switches to a 64 bit frame count, this needs to use the high bits
of the time reference.
*/
set_timeline_position (_broadcast_info->time_reference_low);
}
if (writable()) {
sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE);
/* update header if header offset info changes */
AudioFileSource::HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioFileSource::handle_header_position_change));
}
return 0;
}
void
SndFileSource::close ()
{
if (sf) {
sf_close (sf);
sf = 0;
}
}
SndFileSource::~SndFileSource ()
{
GoingAway (this); /* EMIT SIGNAL */
close ();
if (sf) {
sf_close (sf);
sf = 0;
}
if (interleave_buf) {
delete [] interleave_buf;
}
if (_broadcast_info) {
delete [] _broadcast_info;
free (_broadcast_info);
}
}
@ -404,27 +422,38 @@ SndFileSource::write_unlocked (Sample *data, jack_nframes_t cnt, char * workbuf)
int
SndFileSource::update_header (jack_nframes_t when, struct tm& now, time_t tnow)
{
/* allow derived classes to override how this is done */
set_timeline_position (when);
if (_flags & Broadcast) {
/* this will flush the header implicitly */
return setup_broadcast_info (when, now, tnow);
} else {
return flush_header ();
if (setup_broadcast_info (when, now, tnow)) {
return -1;
}
}
return flush_header ();
}
int
SndFileSource::flush_header ()
{
if (!writable() || (sf == 0)) {
return -1;
}
return (sf_command (sf, SFC_UPDATE_HEADER_NOW, 0, 0) != SF_TRUE);
}
int
SndFileSource::setup_broadcast_info (jack_nframes_t when, struct tm& now, time_t tnow)
{
if (!writable()) {
return -1;
}
if (!(_flags & Broadcast)) {
return 0;
}
/* random code is 9 digits */
int random_code = random() % 999999999;
@ -452,12 +481,10 @@ SndFileSource::setup_broadcast_info (jack_nframes_t when, struct tm& now, time_t
set_header_timeline_position ();
/* note that libsndfile flushes the header to disk when resetting the broadcast info */
if (sf_command (sf, SFC_SET_BROADCAST_INFO, _broadcast_info, sizeof (*_broadcast_info)) != SF_TRUE) {
error << string_compose (_("cannot set broadcast info for audio file %1; Dropping broadcast info for this file"), _path) << endmsg;
_flags = Flag (_flags & ~Broadcast);
delete _broadcast_info;
free (_broadcast_info);
_broadcast_info = 0;
return -1;
}
@ -470,6 +497,10 @@ SndFileSource::set_header_timeline_position ()
{
uint64_t pos;
if (!(_flags & Broadcast)) {
return;
}
_broadcast_info->time_reference_high = 0;
if (header_position_negative) {
@ -491,6 +522,13 @@ SndFileSource::set_header_timeline_position ()
_broadcast_info->time_reference_high = (pos >> 32);
_broadcast_info->time_reference_low = (pos & 0xffffffff);
if (sf_command (sf, SFC_SET_BROADCAST_INFO, _broadcast_info, sizeof (*_broadcast_info)) != SF_TRUE) {
error << string_compose (_("cannot set broadcast info for audio file %1; Dropping broadcast info for this file"), _path) << endmsg;
_flags = Flag (_flags & ~Broadcast);
free (_broadcast_info);
_broadcast_info = 0;
}
}
jack_nframes_t

View file

@ -1087,7 +1087,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
broadcast_info_copy (psf->broadcast_info, data) ;
broadcast_add_coding_history (psf->broadcast_info, psf->sf.channels, psf->sf.samplerate) ;
if (psf->write_header)
if (psf->auto_header && psf->write_header)
psf->write_header (psf, SF_TRUE) ;
return SF_TRUE ;
@ -1210,7 +1210,7 @@ sf_seek (SNDFILE *sndfile, sf_count_t offset, int whence)
if (psf->error)
return PSF_SEEK_ERROR ;
#ifdef ECDL_ORIGINAL#
#ifdef ECDL_ORIGINAL
if (seek_from_start < 0 || seek_from_start > psf->sf.frames)
{ psf->error = SFE_BAD_SEEK ;
return PSF_SEEK_ERROR ;