[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src core/AudioFileCopyConvert.cpp core...
From: |
Nicola Doebelin |
Subject: |
[Traverso-commit] traverso/src core/AudioFileCopyConvert.cpp core... |
Date: |
Thu, 22 May 2008 20:12:52 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 08/05/22 20:12:52
Modified files:
src/core : AudioFileCopyConvert.cpp AudioFileCopyConvert.h
src/traverso/dialogs/project: NewProjectDialog.cpp
NewProjectDialog.h
Log message:
* The track name can now be set in the NewProject dialog
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioFileCopyConvert.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioFileCopyConvert.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.h?cvsroot=traverso&r1=1.7&r2=1.8
Patches:
Index: core/AudioFileCopyConvert.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioFileCopyConvert.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- core/AudioFileCopyConvert.cpp 22 May 2008 19:49:56 -0000 1.4
+++ core/AudioFileCopyConvert.cpp 22 May 2008 20:12:51 -0000 1.5
@@ -49,12 +49,14 @@
* @param dir
* @param outfilename
* @param tracknumber
+ * @param trackname
*/
void AudioFileCopyConvert::enqueue_task(ReadSource * source,
ExportSpecification* spec,
const QString& dir,
const QString& outfilename,
- int tracknumber)
+ int tracknumber,
+ const QString& trackname)
{
QFileInfo fi(outfilename);
@@ -63,6 +65,7 @@
task.outFileName = fi.completeBaseName();
task.extension = fi.suffix();
task.tracknumber = tracknumber;
+ task.trackname = trackname;
task.dir = dir;
task.spec = spec;
@@ -180,7 +183,7 @@
return;
}
- emit taskFinished(task.dir + "/" + task.outFileName + ".wav",
task.tracknumber);
+ emit taskFinished(task.dir + "/" + task.outFileName + ".wav",
task.tracknumber, task.trackname);
}
void AudioFileCopyConvert::stop_merging()
Index: core/AudioFileCopyConvert.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioFileCopyConvert.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- core/AudioFileCopyConvert.h 22 May 2008 15:14:17 -0000 1.2
+++ core/AudioFileCopyConvert.h 22 May 2008 20:12:51 -0000 1.3
@@ -38,7 +38,7 @@
exec();
}
- void enqueue_task(ReadSource* source, ExportSpecification* spec, const
QString& dir, const QString& outfilename, int tracknumber);
+ void enqueue_task(ReadSource* source, ExportSpecification* spec, const
QString& dir, const QString& outfilename, int tracknumber, const QString&
trackname);
void stop_merging();
@@ -51,6 +51,7 @@
QString dir;
QString extension;
int tracknumber;
+ QString trackname;
ReadSource* readsource;
ExportSpecification* spec;
};
@@ -65,7 +66,7 @@
void dequeueTask();
void progress(int);
void taskStarted(QString);
- void taskFinished(QString, int);
+ void taskFinished(QString, int, QString);
void processingStopped();
};
Index: traverso/dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/dialogs/project/NewProjectDialog.cpp 22 May 2008 16:40:03
-0000 1.12
+++ traverso/dialogs/project/NewProjectDialog.cpp 22 May 2008 20:12:51
-0000 1.13
@@ -82,7 +82,7 @@
connect(useTemplateCheckBox, SIGNAL(stateChanged (int)), this,
SLOT(use_template_checkbox_state_changed(int)));
connect(pushButtonAddFiles, SIGNAL(clicked()), this, SLOT(add_files()));
connect(pushButtonRemoveFiles, SIGNAL(clicked()), this,
SLOT(remove_files()));
- connect(m_converter, SIGNAL(taskFinished(QString, int)), this,
SLOT(load_file(QString, int)));
+ connect(m_converter, SIGNAL(taskFinished(QString, int, QString)), this,
SLOT(load_file(QString, int, QString)));
connect(m_converter, SIGNAL(taskStarted(QString)), this,
SLOT(show_progress(QString)));
connect(m_converter, SIGNAL(progress(int)), m_progressDialog,
SLOT(setValue(int)));
connect(m_buttonGroup, SIGNAL(buttonClicked(int)), stackedWidget,
SLOT(setCurrentIndex(int)));
@@ -210,6 +210,7 @@
labels << "Unnamed" << finfo.fileName();
QTreeWidgetItem* item = new QTreeWidgetItem(treeWidgetFiles,
labels, 0);
+ item->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
item->setData(0, Qt::ToolTipRole, finfo.absoluteFilePath());
treeWidgetFiles->addTopLevelItem(item);
}
@@ -236,9 +237,12 @@
m_progressDialog->show();
QList<QFileInfo> list;
- for(int n = 0; n < treeWidgetFiles->topLevelItemCount(); ++n) {
- QTreeWidgetItem* item = treeWidgetFiles->topLevelItem(n);
+ QStringList trackNameList;
+ while(treeWidgetFiles->topLevelItemCount()) {
+ QTreeWidgetItem* item = treeWidgetFiles->takeTopLevelItem(0);
list.append(QFileInfo(item->data(0,
Qt::ToolTipRole).toString()));
+ trackNameList.append(item->text(0));
+ delete item;
}
QString destination = pm().get_project()->get_root_dir() +
"/audiosources/";
@@ -249,7 +253,6 @@
QString fn = destination + list.at(n).fileName();
// TODO: check for free disk space
- // TODO: progress dialog for copying files
// TODO: offer file format conversion while copying: format
options widget not there yet.
// m_formatOptionsWidget->get_format_options(m_exportSpec);
@@ -257,11 +260,7 @@
ReadSource* readsource =
resources_manager()->import_source(list.at(n).absolutePath() + "/",
list.at(n).fileName());
if (readsource) {
- m_converter->enqueue_task(readsource, m_exportSpec,
destination, list.at(n).fileName(), n);
-
- // copy was successful, thus update the file path
- QTreeWidgetItem* item =
treeWidgetFiles->topLevelItem(n);
- item->setData(0, Qt::ToolTipRole, fn);
+ m_converter->enqueue_task(readsource, m_exportSpec,
destination, list.at(n).fileName(), n, trackNameList.at(n));
}
}
}
@@ -273,14 +272,15 @@
while(treeWidgetFiles->topLevelItemCount()) {
QTreeWidgetItem* item = treeWidgetFiles->takeTopLevelItem(0);
QString f = item->data(0, Qt::ToolTipRole).toString();
+ QString n = item->text(0);
delete item;
- load_file(f, i);
+ load_file(f, i, n);
++i;
}
}
-void NewProjectDialog::load_file(QString name, int i)
+void NewProjectDialog::load_file(QString name, int i, QString trackname)
{
Sheet* sheet = pm().get_project()->get_current_sheet();
@@ -292,8 +292,11 @@
return;
}
+ Track* track = sheet->get_track_for_index(i);
+
Import* import = new Import(name);
- import->set_track(sheet->get_track_for_index(i));
+ track->set_name(trackname);
+ import->set_track(track);
import->set_position((TimeRef)0.0);
if (import->create_readsource() != -1) {
Command::process_command(import);
Index: traverso/dialogs/project/NewProjectDialog.h
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- traverso/dialogs/project/NewProjectDialog.h 22 May 2008 16:40:03 -0000
1.7
+++ traverso/dialogs/project/NewProjectDialog.h 22 May 2008 20:12:51 -0000
1.8
@@ -56,11 +56,11 @@
void update_template_combobox();
void add_files();
void remove_files();
- void load_file(QString, int);
+ void load_file(QString, int, QString);
void show_progress(QString);
signals:
- void loadFile(QString, int);
+ void loadFile(QString, int, QString);
};
#endif