[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso ExportWidget.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/traverso ExportWidget.cpp |
Date: |
Fri, 11 May 2007 09:36:19 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/11 09:36:19
Modified files:
src/traverso : ExportWidget.cpp
Log message:
* eject cdrom when invalid disc is inserted
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.20&r2=1.21
Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ExportWidget.cpp 10 May 2007 23:26:32 -0000 1.20
+++ ExportWidget.cpp 11 May 2007 09:36:19 -0000 1.21
@@ -294,21 +294,6 @@
}
-void ExportWidget::on_selectionSongButton_clicked( )
-{
- show_settings_view();
-}
-
-void ExportWidget::on_allSongsButton_clicked( )
-{
- show_settings_view();
-}
-
-void ExportWidget::on_currentSongButton_clicked( )
-{
- show_settings_view();
-}
-
void ExportWidget::update_song_progress( int progress )
{
songProgressBar->setValue(progress);
@@ -523,6 +508,7 @@
connect(m_project, SIGNAL(overallExportProgressChanged(int)), this,
SLOT(cd_export_progress(int)));
connect(m_project, SIGNAL(exportFinished()), this,
SLOT(cd_export_finished()));
+
m_project->export_project(m_exportSpec);
}
@@ -554,14 +540,17 @@
QStringList arguments;
arguments << "write" << "--device" << device << "-n" << "--eject";
+
if (speedComboBox->currentIndex() != 0) {
arguments << "--speed" <<
speedComboBox->currentText().remove("x");
}
+
if (simulateCheckBox->isChecked()) {
arguments <<"--simulate";
}
arguments << m_exportSpec->tocFileName;
+
m_burnprocess->start(CDRDAO_BIN, arguments);
}
@@ -641,6 +630,15 @@
if (sout.contains("Disk seems to be written")) {
+ int index = cdDeviceComboBox->currentIndex();
+ if (index != -1) {
+#if defined (Q_WS_WIN)
+ // No idea if this works.....
+ QProcess::execute("rsm.exe", QStringList() << "eject"
<< "/n0");
+#else
+ QProcess::execute("eject", QStringList() <<
cdDeviceComboBox->itemData(index).toString());
+#endif
+ }
QMessageBox::information( 0, tr("Disc not empty"),
tr("Please, insert an empty disc and
hit enter"),
QMessageBox::Ok);
@@ -664,7 +662,7 @@
if (sout.contains("%") && sout.contains("(") && sout.contains(")")) {
- QStringList strlist = sout.split(" ");
+ QStringList strlist = sout.split(QRegExp("\\s+"));
if (strlist.size() > 7) {
int written = strlist.at(1).toInt();
int total = strlist.at(3).toInt();
@@ -682,7 +680,7 @@
}
if (sout.contains("Writing track")) {
- QStringList strlist = sout.split(" ");
+ QStringList strlist = sout.split(QRegExp("\\s+"));
if (strlist.size() > 3) {
QString text = strlist.at(0) + " " + strlist.at(1) + "
" + strlist.at(2);
update_cdburn_status(text, NORMAL_MESSAGE);
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Ben Levitt, 2007/05/08
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/10
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/10
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Ben Levitt, 2007/05/10
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp,
Remon Sijrier <=
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Nicola Doebelin, 2007/05/11
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/14
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/14
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/15
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/15
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/15
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Remon Sijrier, 2007/05/15
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Ben Levitt, 2007/05/17
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Nicola Doebelin, 2007/05/18
- [Traverso-commit] traverso/src/traverso ExportWidget.cpp, Ben Levitt, 2007/05/23