[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/core/Export.cpp src/core/Export.h ...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso src/core/Export.cpp src/core/Export.h ... |
|
Date: |
Fri, 11 May 2007 11:16:32 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/11 11:16:32
Modified files:
src/core : Export.cpp Export.h Project.cpp Project.h
ReadSource.cpp ReadSource.h Song.cpp
src/traverso : ExportWidget.cpp ExportWidget.h
src/traverso/ui: ExportWidget.ui
. : traverso_en.qm traverso_en.ts traverso_nl.qm
traverso_nl.ts
Log message:
* Only create one project export thread hehe
* moved cdrdao toc creation outside of project render routine.
* minor improvements
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.h?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.h?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/traverso_en.qm?cvsroot=traverso&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/traverso_en.ts?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/traverso_nl.qm?cvsroot=traverso&rev=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/traverso_nl.ts?cvsroot=traverso&r1=1.12&r2=1.13
Patches:
Index: src/core/Export.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/core/Export.cpp 9 May 2007 20:11:47 -0000 1.6
+++ src/core/Export.cpp 11 May 2007 11:16:32 -0000 1.7
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: Export.cpp,v 1.6 2007/05/09 20:11:47 n_doebelin Exp $
+ $Id: Export.cpp,v 1.7 2007/05/11 11:16:32 r_sijrier Exp $
*/
#include "Export.h"
@@ -28,6 +28,7 @@
#include "Debugger.h"
ExportThread::ExportThread(Project* project, ExportSpecification*
specification)
+ : QThread(project)
{
m_project = project;
m_spec = specification;
Index: src/core/Export.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/core/Export.h 10 May 2007 20:02:36 -0000 1.8
+++ src/core/Export.h 11 May 2007 11:16:32 -0000 1.9
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Export.h,v 1.8 2007/05/10 20:02:36 r_sijrier Exp $
+$Id: Export.h,v 1.9 2007/05/11 11:16:32 r_sijrier Exp $
*/
#ifndef EXPORT_H
@@ -42,7 +42,8 @@
enum RenderPass {
CALC_NORM_FACTOR,
- WRITE_TO_HARDDISK
+ WRITE_TO_HARDDISK,
+ CREATE_CDRDAO_TOC
};
int sample_rate;
@@ -77,6 +78,7 @@
QString basename;
QString name;
QString tocFileName;
+ QString cdrdaoToc;
bool writeToc;
bool normalize;
int renderpass;
Index: src/core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/core/Project.cpp 10 May 2007 20:58:46 -0000 1.41
+++ src/core/Project.cpp 11 May 2007 11:16:32 -0000 1.42
@@ -55,6 +55,7 @@
{
PENTERCONS;
m_currentSongId = 0;
+ m_exportThread = 0;
engineer = "";
rootDir = config().get_property("Project", "directory",
"/directory/unknown/").toString() + "/" + title;
@@ -477,13 +478,21 @@
int Project::export_project(ExportSpecification* spec)
{
+ if (!m_exportThread) {
+ m_exportThread = new ExportThread(this, spec);
+ }
+
+ if (m_exportThread->isRunning()) {
+ info().warning(tr("Export allready in progress, cannot start it
twice!"));
+ return -1;
+ }
+
spec->progress = 0;
spec->running = true;
spec->stop = false;
spec->breakout = false;
- ExportThread* exportThread = new ExportThread(this, spec);
- exportThread->start();
+ m_exportThread->start();
return 0;
}
@@ -511,9 +520,6 @@
songsToRender.append(song);
}
- QString cdrdaoImg = get_cdrdao_header(spec);
- bool pregap = true;
-
foreach(Song* song, songsToRender) {
PMESG("Starting export for song %lld", song->get_id());
emit exportStartedForSong(song);
@@ -548,12 +554,9 @@
if (song->prepare_export(spec) < 0) {
PERROR("Failed to prepare song for export");
- continue;
+ break;
}
- cdrdaoImg += song->get_cdrdao_tracklist(spec, pregap);
- pregap = false; //Â only add the pregap at the first song
-
while(song->render(spec) > 0) {}
song->set_transport_pos(spec->resumeTransportFrame);
@@ -569,42 +572,38 @@
renderedSongs++;
}
- if (spec->writeToc) {
- PMESG("Writing cdrdao toc-file");
-
- QString name = spec->exportdir + "/";
-
- if (spec->allSongs) {
- // filename of the toc file is "project-name.toc"
- name += get_title() + ".toc";
- } else {
- // filename of the toc file is "song-name.toc"
- name += spec->basename + ".toc";
- }
-
- spec->tocFileName = name;
-
- QFile file(name);
-
- if (file.open(QFile::WriteOnly)) {
- QTextStream out(&file);
- out << cdrdaoImg;
- }
- }
-
PMESG("Export Finished");
spec->running = false;
overallExportProgress = 0;
- delete spec->dataF;
+
+ delete [] spec->dataF;
+ spec->dataF = 0;
emit exportFinished();
return 1;
}
-QString Project::get_cdrdao_header(ExportSpecification* spec)
+int Project::create_cdrdao_toc(ExportSpecification* spec)
{
+ QList<Song* > songs;
+ QString filename = spec->exportdir;
+
+ if (spec->allSongs) {
+ foreach(Song* song, m_songs) {
+ songs.append(song);
+ }
+ // filename of the toc file is "project-name.toc"
+ filename += get_title() + ".toc";
+ } else {
+ Song* song = get_current_song();
+ if (!song) {
+ return -1;
+ }
+ songs.append(song);
+ }
+
QString output;
output += "CD_DA\n\n";
@@ -623,7 +622,40 @@
output += " MESSAGE \"" + get_message() + "\"\n";
output += " GENRE \"" + QString::number(get_genre()) + "\"\n
}\n}\n\n";
- return output;
+
+ bool pregap = true;
+ spec->renderpass = ExportSpecification::CREATE_CDRDAO_TOC;
+
+ foreach(Song* song, songs) {
+ if (song->prepare_export(spec) < 0) {
+ return -1;
+ }
+ output += song->get_cdrdao_tracklist(spec, pregap);
+ pregap = false; //Â only add the pregap at the first song
+ }
+
+
+ if (spec->writeToc) {
+ if (!spec->allSongs) {
+ // filename of the toc file is "song-name.toc"
+ filename += spec->basename + ".toc";
+ }
+
+ spec->tocFileName = filename;
+
+ QFile file(filename);
+
+ if (file.open(QFile::WriteOnly)) {
+ printf("Saving cdrdao toc-file to %s\n",
QS_C(spec->tocFileName));
+ QTextStream out(&file);
+ out << output;
+ file.close();
+ }
+ }
+
+ spec->cdrdaoToc = output;
+
+ return 1;
}
Command* Project::select()
Index: src/core/Project.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/core/Project.h 10 May 2007 20:58:46 -0000 1.20
+++ src/core/Project.h 11 May 2007 11:16:32 -0000 1.21
@@ -31,6 +31,7 @@
class Song;
class ResourcesManager;
struct ExportSpecification;
+class ExportThread;
class Project : public ContextItem
{
@@ -94,6 +95,7 @@
int load(QString projectfile = "");
int export_project(ExportSpecification* spec);
int start_export(ExportSpecification* spec);
+ int create_cdrdao_toc(ExportSpecification* spec);
public slots:
@@ -104,6 +106,7 @@
QList<Song* > m_songs;
ResourcesManager* m_asmanager;
+ ExportThread* m_exportThread;
QString title;
QString rootDir;
@@ -129,7 +132,6 @@
qint64 m_currentSongId;
int create(int songcount, int numtracks);
- QString get_cdrdao_header(ExportSpecification* spec);
friend class ProjectManager;
Index: src/core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/core/ReadSource.cpp 10 May 2007 20:02:36 -0000 1.29
+++ src/core/ReadSource.cpp 11 May 2007 11:16:32 -0000 1.30
@@ -43,7 +43,6 @@
// This constructor is called for existing (recorded/imported) audio sources
ReadSource::ReadSource(const QDomNode node)
: AudioSource(node)
- , m_sources()
, m_refcount(0)
, m_unrefcount(0)
, m_error(0)
Index: src/core/ReadSource.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/core/ReadSource.h 10 May 2007 20:02:36 -0000 1.22
+++ src/core/ReadSource.h 11 May 2007 11:16:32 -0000 1.23
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: ReadSource.h,v 1.22 2007/05/10 20:02:36 r_sijrier Exp $
+$Id: ReadSource.h,v 1.23 2007/05/11 11:16:32 r_sijrier Exp $
*/
#ifndef READSOURCE_H
@@ -66,11 +66,11 @@
QList<MonoReader*> get_mono_readers() const {return m_sources;}
private:
- AudioClip* m_clip;
QList<MonoReader*> m_sources;
int m_refcount;
int m_unrefcount;
int m_error;
+ AudioClip* m_clip;
int m_usedByClips;
bool m_silent;
Index: src/core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- src/core/Song.cpp 10 May 2007 20:58:46 -0000 1.93
+++ src/core/Song.cpp 11 May 2007 11:16:32 -0000 1.94
@@ -313,12 +313,14 @@
{
PENTER;
+ if ( ! (spec->renderpass == ExportSpecification::CREATE_CDRDAO_TOC) ) {
if (transport) {
spec->resumeTransport = true;
stopTransport = true;
}
rendering = true;
+ }
spec->start_frame = INT_MAX;
spec->end_frame = 0;
@@ -359,23 +361,23 @@
transportFrame = spec->start_frame;
spec->progress = 0;
- QString idString = QString::number(m_id);
- if (m_id < 10) {
- idString.prepend("0");
- }
spec->basename = "Song" +
QString::number(m_project->get_song_index(m_id)) +"-" + title;
spec->name = spec->basename + spec->extension;
if (spec->start_frame >= spec->end_frame) {
- PWARN("illegal frame range in export specification");
+ info().warning(tr("Export start frame starts beyong export end
frame!!"));
return -1;
}
if (spec->channels == 0) {
- PWARN("Illegal channel count (0) in export specification");
+ info().warning(tr("Export tries to render to 0 channels wav
file??"));
return -1;
}
+ if (spec->renderpass == ExportSpecification::CREATE_CDRDAO_TOC) {
+ return 1;
+ }
+
if (spec->renderpass == ExportSpecification::WRITE_TO_HARDDISK) {
m_exportSource = new WriteSource(spec);
}
@@ -902,36 +904,36 @@
// Sort the list according to Marker::get_when() values. This
// is the correct way to do it according to the Qt docu.
- QMap<nframes_t, Marker*> mmap;
+ QMap<nframes_t, Marker*> markermap;
foreach(Marker *marker, mlist) {
- mmap.insert(marker->get_when(), marker);
+ markermap.insert(marker->get_when(), marker);
}
- mlist = mmap.values();
+ mlist = markermap.values();
nframes_t start = 0;
for(int i = 0; i < mlist.size()-1; ++i) {
- Marker *m_start = mlist.at(i);
- Marker *m_end = mlist.at(i+1);
+ Marker* startmarker = mlist.at(i);
+ Marker* endmarker = mlist.at(i+1);
output += "TRACK AUDIO\n";
- if (m_start->get_copyprotect()) {
+ if (startmarker->get_copyprotect()) {
output += " NO COPY\n";
} else {
output += " COPY\n";
}
- if (m_start->get_preemphasis()) {
+ if (startmarker->get_preemphasis()) {
output += " PRE_EMPHASIS\n";
}
output += " CD_TEXT {\n LANGUAGE 0 {\n";
- output += " TITLE \"" + m_start->get_description() +
"\"\n";
- output += " PERFORMER \"" + m_start->get_performer() +
"\"\n";
- output += " ISRC \"" + m_start->get_isrc() + "\"\n";
- output += " ARRANGER \"" + m_start->get_arranger() +
"\"\n";
- output += " SONGWRITER \"" + m_start->get_songwriter() +
"\"\n";
- output += " MESSAGE \"" + m_start->get_message() + "\"\n
}\n }\n";
+ output += " TITLE \"" + startmarker->get_description() +
"\"\n";
+ output += " PERFORMER \"" + startmarker->get_performer() +
"\"\n";
+ output += " ISRC \"" + startmarker->get_isrc() + "\"\n";
+ output += " ARRANGER \"" + startmarker->get_arranger() +
"\"\n";
+ output += " SONGWRITER \"" + startmarker->get_songwriter()
+ "\"\n";
+ output += " MESSAGE \"" + startmarker->get_message() +
"\"\n }\n }\n";
//Â add a standard pregap if requested, but only if it is the
first track
if (pregap && (i == 0)) {
@@ -939,13 +941,13 @@
}
if (i == 0) {
- start = cd_to_frame(frame_to_cd(m_start->get_when(),
m_project->get_rate()), m_project->get_rate());
+ start =
cd_to_frame(frame_to_cd(startmarker->get_when(), m_project->get_rate()),
m_project->get_rate());
// I thought some cd players required a 2-second PREGAP
on the first track?
// FIXME: Uncomment, remove, or make configurable in
the Export dialog.
// output += " PREGAP 0:02:00\n";
}
- nframes_t end = cd_to_frame(frame_to_cd(m_end->get_when(),
m_project->get_rate()), m_project->get_rate());
+ nframes_t end = cd_to_frame(frame_to_cd(endmarker->get_when(),
m_project->get_rate()), m_project->get_rate());
nframes_t length = end - start;
QString s_start = frame_to_cd(start, m_project->get_rate());
@@ -955,7 +957,7 @@
start += length;
// check if the second marker is of type "Endmarker"
- if ((m_end->get_type() == Marker::ENDMARKER) ||
(m_end->get_type() == Marker::TEMP_ENDMARKER)) {
+ if ((endmarker->get_type() == Marker::ENDMARKER) ||
(endmarker->get_type() == Marker::TEMP_ENDMARKER)) {
break;
}
}
Index: src/traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/traverso/ExportWidget.cpp 11 May 2007 09:36:19 -0000 1.21
+++ src/traverso/ExportWidget.cpp 11 May 2007 11:16:32 -0000 1.22
@@ -498,14 +498,15 @@
} else {
m_exportSpec->allSongs = false;
}
- QString name = m_exportSpec->exportdir + "/";
- QFileInfo fi(m_exportSpec->name);
- name += fi.completeBaseName() + ".toc";
- m_exportSpec->tocFileName = name;
m_exportSpec->normalize = cdNormalizeCheckBox->isChecked();
m_exportSpec->isRecording = false;
+ if (m_project->create_cdrdao_toc(m_exportSpec) < 0) {
+ info().warning(tr("Creating CDROM table of contents failed,
unable to write CD"));
+ return;
+ }
+
connect(m_project, SIGNAL(overallExportProgressChanged(int)), this,
SLOT(cd_export_progress(int)));
connect(m_project, SIGNAL(exportFinished()), this,
SLOT(cd_export_finished()));
Index: src/traverso/ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/ExportWidget.h 10 May 2007 20:44:20 -0000 1.7
+++ src/traverso/ExportWidget.h 11 May 2007 11:16:32 -0000 1.8
@@ -79,9 +79,6 @@
void on_fileSelectButton_clicked();
void on_exportStartButton_clicked();
void on_exportStopButton_clicked();
- void on_selectionSongButton_clicked();
- void on_allSongsButton_clicked();
- void on_currentSongButton_clicked();
void on_cancelButton_clicked();
void start_burn_process();
Index: src/traverso/ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/ui/ExportWidget.ui 10 May 2007 22:19:47 -0000 1.10
+++ src/traverso/ui/ExportWidget.ui 11 May 2007 11:16:32 -0000 1.11
@@ -701,7 +701,7 @@
<item>
<widget class="QPushButton" name="stopButton" >
<property name="text" >
- <string>Stop</string>
+ <string>Abort</string>
</property>
</widget>
</item>
Index: traverso_en.qm
===================================================================
RCS file: /sources/traverso/traverso/traverso_en.qm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsQDvXUj and /tmp/cvsGo0HnD differ
Index: traverso_en.ts
===================================================================
RCS file: /sources/traverso/traverso/traverso_en.ts,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso_en.ts 7 May 2007 10:31:22 -0000 1.2
+++ traverso_en.ts 11 May 2007 11:16:32 -0000 1.3
@@ -68,7 +68,7 @@
</style></head><body style=" font-family:'Sans
Serif'; font-size:9pt; font-weight:400; font-style:normal;
text-decoration:none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" font-weight:600;">Number of Periods:</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Audio is
managed in small chunks called periods. </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">This value
determines how many of these chuncks are </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">This value
determines how many of these chunks are </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">to be used by
the driver of the audiocard.</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">The default
should work just fine, and gives optimal latency behavior.</p>
@@ -148,17 +148,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="573"/>
+ <location filename="src/core/AudioClip.cpp" line="579"/>
<source>Toggle Mute</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="902"/>
+ <location filename="src/core/AudioClip.cpp" line="890"/>
<source>Normalization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="903"/>
+ <location filename="src/core/AudioClip.cpp" line="891"/>
<source>Set Normalization level:</source>
<translation type="unfinished"></translation>
</message>
@@ -183,11 +183,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="714"/>
- <source>No ReadSource returned from resources manager after recording,
removing clip from Track!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="src/core/AudioClip.h" line="51"/>
<source>Out: Reset</source>
<translation type="unfinished"></translation>
@@ -272,27 +267,27 @@
<context>
<name>AudioClipView</name>
<message>
- <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="135"/>
+ <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="139"/>
<source>Click to reset AudioFile !</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="758"/>
+ <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="774"/>
<source>Reset Audio File for Clip: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="760"/>
+ <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="776"/>
<source>All files (*);;Audio files (*.wav *.flac)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="763"/>
+ <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="779"/>
<source>No file selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="773"/>
+ <location filename="src/traverso/songcanvas/AudioClipView.cpp"
line="789"/>
<source>Succesfully set AudioClip file to %1</source>
<translation type="unfinished"></translation>
</message>
@@ -358,7 +353,7 @@
<context>
<name>AudioDeviceThread</name>
<message>
- <location filename="src/engine/AudioDeviceThread.cpp" line="136"/>
+ <location filename="src/engine/AudioDeviceThread.cpp" line="137"/>
<source>Unable to set Audiodevice Thread to realtime priority!!!This
most likely results in unreliable playback/capture and lots of buffer underruns
(== sound drops).In the worst case the program can even malfunction!Please make
sure you run this program with realtime privileges!!!</source>
<translation type="unfinished"></translation>
</message>
@@ -628,7 +623,7 @@
<context>
<name>CurveView</name>
<message>
- <location filename="src/traverso/songcanvas/CurveView.cpp" line="510"/>
+ <location filename="src/traverso/songcanvas/CurveView.cpp" line="512"/>
<source>Drag Node</source>
<translation type="unfinished"></translation>
</message>
@@ -669,7 +664,7 @@
<context>
<name>DigitalClock</name>
<message>
- <location filename="src/traverso/Interface.cpp" line="761"/>
+ <location filename="src/traverso/Interface.cpp" line="861"/>
<source>Digital Clock</source>
<translation type="unfinished"></translation>
</message>
@@ -677,12 +672,12 @@
<context>
<name>DragMarker</name>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="56"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="57"/>
<source>Move Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="57"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="58"/>
<source>Move right</source>
<translation type="unfinished"></translation>
</message>
@@ -811,7 +806,7 @@
<context>
<name>DriverInfo</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="142"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="146"/>
<source>Click to configure audiodevice</source>
<translation type="unfinished"></translation>
</message>
@@ -819,118 +814,158 @@
<context>
<name>ExportWidget</name>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="266"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="335"/>
<source>No project loaded, to export a project, load it first!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="134"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="123"/>
<source>Unable to create export directory! Please check permissions
for this directory: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="270"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="263"/>
<source>Choose/create an export directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="164"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="66"/>
<source>General options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="176"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="78"/>
<source>Export directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="203"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="105"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="212"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="114"/>
<source>Song(s) to render</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="247"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="149"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="227"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="129"/>
<source>Current</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="237"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="139"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="267"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="169"/>
<source>Export specifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="303"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="205"/>
<source>Audio type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="313"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="215"/>
<source>Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="341"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="243"/>
<source>Bitdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="351"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="253"/>
<source>Sample rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="34"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="297"/>
<source>Export status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="62"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="317"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="134"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="501"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="94"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="349"/>
<source>Overall Progress</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="125"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="114"/>
<source>Export during recording is not supported!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="318"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="311"/>
<source>Progress of Song </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="13"/>
- <source>Export to harddisk</source>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="267"/>
+ <source>Calculate and apply normalization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="365"/>
- <source>Calculate and apply normalization</source>
+ <location filename="src/traverso/ExportWidget.cpp" line="413"/>
+ <source>CD Writer not ready, no disk inserted?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="25"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="41"/>
+ <source>Export to Harddisk</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="420"/>
+ <source>Burn to CD</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="432"/>
+ <source>Export to disk only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="439"/>
+ <source>Simulate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="454"/>
+ <source>Information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="494"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="508"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1035,7 +1070,7 @@
<context>
<name>InfoToolBar</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="553"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="557"/>
<source>Main Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1079,22 +1114,22 @@
<context>
<name>Interface</name>
<message>
- <location filename="src/traverso/Interface.cpp" line="117"/>
+ <location filename="src/traverso/Interface.cpp" line="116"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="134"/>
+ <location filename="src/traverso/Interface.cpp" line="133"/>
<source>Correlation Meter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="142"/>
+ <location filename="src/traverso/Interface.cpp" line="141"/>
<source>FFT Spectrum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="300"/>
+ <location filename="src/traverso/Interface.cpp" line="292"/>
<source>Traverso %1, making use of Qt %2
Traverso, a Multitrack audio recording and editing program.
@@ -1108,120 +1143,155 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="301"/>
+ <location filename="src/traverso/Interface.h" line="74"/>
<source>About Traverso</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="375"/>
+ <location filename="src/traverso/Interface.cpp" line="370"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="340"/>
+ <location filename="src/traverso/Interface.cpp" line="335"/>
<source>&Project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="354"/>
+ <location filename="src/traverso/Interface.cpp" line="349"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="419"/>
+ <location filename="src/traverso/Interface.cpp" line="415"/>
<source>System Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="433"/>
+ <location filename="src/traverso/Interface.cpp" line="429"/>
<source>&HandBook</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="437"/>
+ <location filename="src/traverso/Interface.cpp" line="433"/>
<source>&About Traverso</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="125"/>
+ <location filename="src/traverso/Interface.cpp" line="124"/>
<source>Resources Bin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="342"/>
+ <location filename="src/traverso/Interface.cpp" line="337"/>
<source>&New...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="347"/>
+ <location filename="src/traverso/Interface.cpp" line="342"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="360"/>
+ <location filename="src/traverso/Interface.cpp" line="355"/>
<source>&Manage Project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="368"/>
+ <location filename="src/traverso/Interface.cpp" line="363"/>
<source>&Export...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="380"/>
+ <location filename="src/traverso/Interface.cpp" line="375"/>
<source>&Song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="382"/>
+ <location filename="src/traverso/Interface.cpp" line="378"/>
<source>New &Track(s)...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="384"/>
+ <location filename="src/traverso/Interface.cpp" line="380"/>
<source>New &Song(s)...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="389"/>
+ <location filename="src/traverso/Interface.cpp" line="385"/>
<source>Import &Audio...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="391"/>
+ <location filename="src/traverso/Interface.cpp" line="387"/>
<source>Insert Si&lence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="395"/>
+ <location filename="src/traverso/Interface.cpp" line="391"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="403"/>
+ <location filename="src/traverso/Interface.cpp" line="399"/>
<source>Marker Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="406"/>
+ <location filename="src/traverso/Interface.cpp" line="402"/>
<source>CD Text Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="417"/>
+ <location filename="src/traverso/Interface.cpp" line="413"/>
<source>Song Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="422"/>
+ <location filename="src/traverso/Interface.cpp" line="418"/>
<source>Se&ttings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/Interface.cpp" line="428"/>
+ <location filename="src/traverso/Interface.cpp" line="424"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="src/traverso/Interface.cpp" line="582"/>
+ <source><b>Description</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.cpp" line="582"/>
+ <source><b>Key Sequence</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.h" line="72"/>
+ <source>Show Export Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.h" line="73"/>
+ <source>Show Context Menu</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.h" line="75"/>
+ <source>Show Project Management Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.h" line="76"/>
+ <source>Full Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/Interface.h" line="77"/>
+ <source>Export keymap</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JackDriver</name>
@@ -1760,12 +1830,12 @@
<context>
<name>PADriver</name>
<message>
- <location filename="src/engine/PADriver.cpp" line="275"/>
+ <location filename="src/engine/PADriver.cpp" line="280"/>
<source>PADriver:: PortAudio error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/engine/PADriver.cpp" line="174"/>
+ <location filename="src/engine/PADriver.cpp" line="179"/>
<source>PADriver:: hostapi %1 was not found by Portaudio!</source>
<translation type="unfinished"></translation>
</message>
@@ -1860,7 +1930,7 @@
<context>
<name>PlayHeadInfo</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="433"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="437"/>
<source>Start/stop playback. You should use the SpaceBar! ;-)</source>
<translation type="unfinished"></translation>
</message>
@@ -1914,87 +1984,87 @@
<context>
<name>Project</name>
<message>
- <location filename="src/core/Project.cpp" line="347"/>
+ <location filename="src/core/Project.cpp" line="348"/>
<source>Song %1 added</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="373"/>
+ <location filename="src/core/Project.cpp" line="374"/>
<source>Song '%1' doesn't exist!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="105"/>
+ <location filename="src/core/Project.cpp" line="106"/>
<source>Cannot create dir %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="121"/>
+ <location filename="src/core/Project.cpp" line="122"/>
<source>Created new Project %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="145"/>
+ <location filename="src/core/Project.cpp" line="146"/>
<source>Project %1: Cannot open project.tpf file! (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="172"/>
+ <location filename="src/core/Project.cpp" line="173"/>
<source>No backup project file available, unable to restore
project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="161"/>
+ <location filename="src/core/Project.cpp" line="162"/>
<source>Project %1: Failed to parse project.tpf file! (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="182"/>
+ <location filename="src/core/Project.cpp" line="183"/>
<source>Project file restored from older version (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="192"/>
+ <location filename="src/core/Project.cpp" line="193"/>
<source>Project File Version does not match, unable to load
Project!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="235"/>
+ <location filename="src/core/Project.cpp" line="236"/>
<source>Project %1 loaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="259"/>
+ <location filename="src/core/Project.cpp" line="260"/>
<source>Project %1 saved </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="261"/>
+ <location filename="src/core/Project.cpp" line="262"/>
<source>Couldn't open Project properties file for writing!
(%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="420"/>
+ <location filename="src/core/Project.cpp" line="421"/>
<source>Remove Song %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="484"/>
+ <location filename="src/core/Project.cpp" line="489"/>
<source>Detected clipping in exported audio! (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="487"/>
+ <location filename="src/core/Project.cpp" line="493"/>
<source>calculated norm factor: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="634"/>
+ <location filename="src/core/Project.cpp" line="699"/>
<source>Traverso - Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="635"/>
+ <location filename="src/core/Project.cpp" line="700"/>
<source>You're still recording, please stop recording first to be
able to exit the application!</source>
<translation type="unfinished"></translation>
</message>
@@ -2040,7 +2110,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/ProjectManager.cpp" line="98"/>
+ <location filename="src/core/ProjectManager.h" line="37"/>
<source>Save Project</source>
<translation type="unfinished"></translation>
</message>
@@ -2107,6 +2177,11 @@
</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="src/core/ProjectManager.h" line="38"/>
+ <source>Exit application</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ProjectManagerDialog</name>
@@ -2327,7 +2402,7 @@
<context>
<name>ReadSource</name>
<message>
- <location filename="src/core/ReadSource.cpp" line="98"/>
+ <location filename="src/core/ReadSource.cpp" line="101"/>
<source>Silence</source>
<translation type="unfinished"></translation>
</message>
@@ -2335,17 +2410,17 @@
<context>
<name>ResourcesManager</name>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="139"/>
+ <location filename="src/core/ResourcesManager.cpp" line="140"/>
<source>ResourcesManager : AudioClip with id %1 not in database,unable
to remove it!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="154"/>
+ <location filename="src/core/ResourcesManager.cpp" line="155"/>
<source>ResourcesManager: AudioClip with id %1 not in database,unable
to UNDO removal!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="263"/>
+ <location filename="src/core/ResourcesManager.cpp" line="246"/>
<source>ResourcesManager:: Failed to initialize ReadSource %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2449,23 +2524,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Song.cpp" line="1016"/>
+ <location filename="src/core/Song.cpp" line="1060"/>
<source>Hard Disk overload detected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Song.cpp" line="1008"/>
+ <location filename="src/core/Song.cpp" line="1052"/>
<source>Failed to fill ReadBuffer in time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Song.cpp" line="1017"/>
+ <location filename="src/core/Song.cpp" line="1061"/>
<source>Failed to empty WriteBuffer in time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/core/Song.h" line="52"/>
- <source>Workcursor: To next ege</source>
+ <source>Workcursor: To next edge</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2499,7 +2574,7 @@
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="src/core/Song.cpp" line="656"/>
+ <location filename="src/core/Song.cpp" line="660"/>
<source>Recording to %n Clip(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -2534,42 +2609,42 @@
<context>
<name>SongInfo</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="618"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="622"/>
<source>Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="599"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="603"/>
<source>&Snap</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="601"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="605"/>
<source>Snap items to edges of other items while dragging.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="606"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="610"/>
<source>S&croll Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="608"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="612"/>
<source>Keep play cursor in view while playing or recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="620"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="624"/>
<source>Toggle recording state on/off</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="633"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="637"/>
<source>Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="643"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="647"/>
<source>Redo</source>
<translation type="unfinished"></translation>
</message>
@@ -2615,7 +2690,7 @@
<context>
<name>SongSelector</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="354"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="358"/>
<source>Select Song to be displayed</source>
<translation type="unfinished"></translation>
</message>
@@ -2844,22 +2919,22 @@
<context>
<name>SpectralMeterView</name>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="603"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="602"/>
<source>Screen Capture file name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="644"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="643"/>
<source>Select output format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="644"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="643"/>
<source>Output format:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="652"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="651"/>
<source>Export average dB curve</source>
<translation type="unfinished"></translation>
</message>
@@ -2889,22 +2964,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="611"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="610"/>
<source>FFT: Unable to write captured image to hard disk</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="622"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="621"/>
<source>FFT: No avarage curve used, not data to export!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="623"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="622"/>
<source>FFT: Enable avarage curve with < M > to generate
data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/SpectralMeterWidget.cpp" line="631"/>
+ <location filename="src/traverso/SpectralMeterWidget.cpp" line="630"/>
<source>FFT: No avarage data to export!</source>
<translation type="unfinished"></translation>
</message>
@@ -2920,7 +2995,7 @@
<context>
<name>SysInfoToolBar</name>
<message>
- <location filename="src/traverso/widgets/InfoWidgets.cpp" line="772"/>
+ <location filename="src/traverso/widgets/InfoWidgets.cpp" line="776"/>
<source>System Information</source>
<translation type="unfinished"></translation>
</message>
@@ -3077,12 +3152,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="333"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="351"/>
<source>End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="436"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="454"/>
<source>Clear Markers</source>
<translation type="unfinished"></translation>
</message>
@@ -3105,7 +3180,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="src/core/Track.cpp" line="497"/>
+ <location filename="src/core/Track.cpp" line="501"/>
<source>Silence Others</source>
<translation type="unfinished"></translation>
</message>
Index: traverso_nl.qm
===================================================================
RCS file: /sources/traverso/traverso/traverso_nl.qm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsUMEkom and /tmp/cvsEPXiYF differ
Index: traverso_nl.ts
===================================================================
RCS file: /sources/traverso/traverso/traverso_nl.ts,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso_nl.ts 9 May 2007 13:20:58 -0000 1.12
+++ traverso_nl.ts 11 May 2007 11:16:32 -0000 1.13
@@ -191,24 +191,24 @@
<translation>AudioApparaat heeft deze Opname Bus niet: %1 (Track
%2)</translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="902"/>
+ <location filename="src/core/AudioClip.cpp" line="890"/>
<source>Normalization</source>
<translation>Normalizatie</translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="903"/>
+ <location filename="src/core/AudioClip.cpp" line="891"/>
<source>Set Normalization level:</source>
<translation>Geef normalizatie niveau:</translation>
</message>
<message>
- <location filename="src/core/AudioClip.cpp" line="573"/>
+ <location filename="src/core/AudioClip.cpp" line="579"/>
<source>Toggle Mute</source>
<translation>Schakel Mute</translation>
</message>
<message>
<location filename="src/core/AudioClip.cpp" line="714"/>
<source>No ReadSource returned from resources manager after recording,
removing clip from Track!</source>
- <translation>De resources manager gaf geen ReadSource terug na de
opname, de clip wordt uit de track verwijderd!</translation>
+ <translation type="obsolete">De resources manager gaf geen ReadSource
terug na de opname, de clip wordt uit de track verwijderd!</translation>
</message>
<message>
<location filename="src/core/AudioClip.h" line="49"/>
@@ -952,42 +952,42 @@
<translation type="obsolete">Kan Export map niet aanmaken, controleer
de rechten a.u.b.!</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="203"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="105"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="247"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="149"/>
<source>Selection</source>
<translation>Selectie</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="227"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="129"/>
<source>Current</source>
<translation>Huidige</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="237"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="139"/>
<source>All</source>
<translation>Alle</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="313"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="215"/>
<source>Channels</source>
<translation>Kanalen</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="341"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="243"/>
<source>Bitdepth</source>
<translation>Bit diepte</translation>
</message>
<message>
- <location filename="" line="6357106"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="494"/>
<source>Start</source>
- <translation type="obsolete">Start</translation>
+ <translation type="unfinished">Start</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="34"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="297"/>
<source>Export status</source>
<translation></translation>
</message>
@@ -997,22 +997,22 @@
<translation type="obsolete">Voortgang van Song:</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="134"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="501"/>
<source>Stop</source>
<translation></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="94"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="349"/>
<source>Overall Progress</source>
<translation>Totale voortgang</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="62"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="317"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="336"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="335"/>
<source>No project loaded, to export a project, load it first!</source>
<translation>Er moet een project geopend zijn om het te kunnen
exporteren!</translation>
</message>
@@ -1022,37 +1022,37 @@
<translation type="obsolete">Kan export map niet aanmaken. Controleer
of u toegang heeft voor deze map:</translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="258"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="263"/>
<source>Choose/create an export directory</source>
<translation>Kies of maak een export map</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="164"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="66"/>
<source>General options</source>
<translation>Algemene opties</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="176"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="78"/>
<source>Export directory</source>
<translation>Export map</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="212"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="114"/>
<source>Song(s) to render</source>
<translation>Te renderen Song(s)</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="267"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="169"/>
<source>Export specifications</source>
<translation>Export specificaties</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="303"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="205"/>
<source>Audio type</source>
<translation></translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="351"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="253"/>
<source>Sample rate</source>
<translation></translation>
</message>
@@ -1067,20 +1067,60 @@
<translation>Tijdens opname is exporteren niet mogelijk!</translation>
</message>
<message>
- <location filename="src/traverso/ExportWidget.cpp" line="306"/>
+ <location filename="src/traverso/ExportWidget.cpp" line="311"/>
<source>Progress of Song </source>
<translation>Voortgang van Song</translation>
</message>
<message>
<location filename="src/traverso/ui/ExportWidget.ui" line="13"/>
<source>Export to harddisk</source>
- <translation>Exporteer naar harde schijf</translation>
+ <translation type="obsolete">Exporteer naar harde schijf</translation>
</message>
<message>
- <location filename="src/traverso/ui/ExportWidget.ui" line="365"/>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="267"/>
<source>Calculate and apply normalization</source>
<translation>Bereken en pas normalizatie toe</translation>
</message>
+ <message>
+ <location filename="src/traverso/ExportWidget.cpp" line="413"/>
+ <source>CD Writer not ready, no disk inserted?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="25"/>
+ <source>Export</source>
+ <translation type="unfinished">Exporteer</translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="41"/>
+ <source>Export to Harddisk</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="420"/>
+ <source>Burn to CD</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="432"/>
+ <source>Export to disk only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="439"/>
+ <source>Simulate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="454"/>
+ <source>Information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="src/traverso/ui/ExportWidget.ui" line="508"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FadeContextDialog</name>
@@ -2374,87 +2414,87 @@
<translation type="obsolete">Song %1 bestaat niet</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="105"/>
+ <location filename="src/core/Project.cpp" line="106"/>
<source>Cannot create dir %1</source>
<translation>Kan map %1 niet maken</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="121"/>
+ <location filename="src/core/Project.cpp" line="122"/>
<source>Created new Project %1</source>
<translation>Project %1 aangemaakt</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="145"/>
+ <location filename="src/core/Project.cpp" line="146"/>
<source>Project %1: Cannot open project.tpf file! (%2)</source>
<translation>Project %1: Kan bestand project.tpf niet openen!
(%2)</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="172"/>
+ <location filename="src/core/Project.cpp" line="173"/>
<source>No backup project file available, unable to restore
project</source>
<translation>Geen backup bestand aanwezig, kon project niet
herstellen</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="161"/>
+ <location filename="src/core/Project.cpp" line="162"/>
<source>Project %1: Failed to parse project.tpf file! (%2)</source>
<translation>Project %1: Probleem met inlezen van project.tpf file!
(%2)</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="182"/>
+ <location filename="src/core/Project.cpp" line="183"/>
<source>Project file restored from older version (%1)</source>
<translation>Project hersteld met oudere versie (%1)</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="192"/>
+ <location filename="src/core/Project.cpp" line="193"/>
<source>Project File Version does not match, unable to load
Project!</source>
<translation>Project Bestand Versie ongelijk, kan Project niet
laden!</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="235"/>
+ <location filename="src/core/Project.cpp" line="236"/>
<source>Project %1 loaded</source>
<translation>Project %1 geladen</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="259"/>
+ <location filename="src/core/Project.cpp" line="260"/>
<source>Project %1 saved </source>
<translation>Project %1 opgeslagen</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="261"/>
+ <location filename="src/core/Project.cpp" line="262"/>
<source>Couldn't open Project properties file for writing!
(%1)</source>
<translation>Kan niet naar Project opties bestand schrijven!
(%1)</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="347"/>
+ <location filename="src/core/Project.cpp" line="348"/>
<source>Song %1 added</source>
<translation>Song %1 toegevoegd</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="373"/>
+ <location filename="src/core/Project.cpp" line="374"/>
<source>Song '%1' doesn't exist!</source>
<translation>Song %1 bestaat niet!</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="420"/>
+ <location filename="src/core/Project.cpp" line="421"/>
<source>Remove Song %1</source>
<translation>Verwijder Song %1</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="486"/>
+ <location filename="src/core/Project.cpp" line="489"/>
<source>Detected clipping in exported audio! (%1)</source>
<translation>Te luid signaal gedecteerd in gexporteerde audio!
(%1)</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="489"/>
+ <location filename="src/core/Project.cpp" line="493"/>
<source>calculated norm factor: %1</source>
<translation>Normalisatie factor is: %1</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="646"/>
+ <location filename="src/core/Project.cpp" line="699"/>
<source>Traverso - Information</source>
<translation>Traverso - Informatie</translation>
</message>
<message>
- <location filename="src/core/Project.cpp" line="647"/>
+ <location filename="src/core/Project.cpp" line="700"/>
<source>You're still recording, please stop recording first to be
able to exit the application!</source>
<translation>U bent aan het opnemen! U dient opnemen eerst te
beëindingen om af te kunnen sluiten!</translation>
</message>
@@ -3043,7 +3083,7 @@
<context>
<name>ReadSource</name>
<message>
- <location filename="src/core/ReadSource.cpp" line="98"/>
+ <location filename="src/core/ReadSource.cpp" line="101"/>
<source>Silence</source>
<translation>Stilte</translation>
</message>
@@ -3051,17 +3091,17 @@
<context>
<name>ResourcesManager</name>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="139"/>
+ <location filename="src/core/ResourcesManager.cpp" line="140"/>
<source>ResourcesManager : AudioClip with id %1 not in database,unable
to remove it!</source>
<translation>ResourcesManager : AudioClip met id %1 bestaat niet in de
database, verwijderen onmogelijk!</translation>
</message>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="154"/>
+ <location filename="src/core/ResourcesManager.cpp" line="155"/>
<source>ResourcesManager: AudioClip with id %1 not in database,unable
to UNDO removal!</source>
<translation>ResourcesManager : AudioClip met id %1 bestaat niet in de
database, verwijderen kan niet ongedaan gemaakt worden!</translation>
</message>
<message>
- <location filename="src/core/ResourcesManager.cpp" line="263"/>
+ <location filename="src/core/ResourcesManager.cpp" line="246"/>
<source>ResourcesManager:: Failed to initialize ReadSource %1</source>
<translation>ResourcesManager:: ReadSource %1 kon niet
geïnitialiseerd worden</translation>
</message>
@@ -3145,17 +3185,17 @@
<context>
<name>Song</name>
<message>
- <location filename="src/core/Song.cpp" line="1045"/>
+ <location filename="src/core/Song.cpp" line="1060"/>
<source>Hard Disk overload detected!</source>
<translation>Overbelasting van de harde schijf
gedetecteerd!</translation>
</message>
<message>
- <location filename="src/core/Song.cpp" line="1037"/>
+ <location filename="src/core/Song.cpp" line="1052"/>
<source>Failed to fill ReadBuffer in time</source>
<translation>Kon ReadBuffer niet op tijd vullen</translation>
</message>
<message>
- <location filename="src/core/Song.cpp" line="1046"/>
+ <location filename="src/core/Song.cpp" line="1061"/>
<source>Failed to empty WriteBuffer in time</source>
<translation>Kon WriteBuffer niet op tijd leggen</translation>
</message>
@@ -3180,7 +3220,7 @@
<translation>Geen artiest naam opgegeven</translation>
</message>
<message numerus="yes">
- <location filename="src/core/Song.cpp" line="663"/>
+ <location filename="src/core/Song.cpp" line="660"/>
<source>Recording to %n Clip(s)</source>
<translation>
<numerusform>Opnemen naar %n Clip</numerusform>
@@ -3867,7 +3907,7 @@
<context>
<name>TimeLineView</name>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="335"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="351"/>
<source>End</source>
<translation>Einde</translation>
</message>
@@ -3882,7 +3922,7 @@
<translation>Marker verplaatsen</translation>
</message>
<message>
- <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="438"/>
+ <location filename="src/traverso/songcanvas/TimeLineView.cpp"
line="454"/>
<source>Clear Markers</source>
<translation>Markers verwijderen</translation>
</message>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/core/Export.cpp src/core/Export.h ...,
Remon Sijrier <=