[Traverso-commit] traverso/src/traverso ExportWidget.cpp

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/04 04:20:22

Modified files:
        src/traverso   : ExportWidget.cpp 

Log message:
        oops, this should have gone in with the last commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.49&r2=1.50

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- ExportWidget.cpp    29 Jun 2007 22:15:18 -0000      1.49
+++ ExportWidget.cpp    4 Aug 2007 04:20:22 -0000       1.50
@@ -180,15 +180,18 @@
        
        switch (audioTypeComboBox->currentIndex()) {
         case   0:
-                m_exportSpec->format = SF_FORMAT_WAV;
+                m_exportSpec->writerType = "sf";
+                m_exportSpec->extraFormat["filetype"] = "wav";
                 m_exportSpec->extension = ".wav";
                 break;
         case   1:
-                m_exportSpec->format = SF_FORMAT_AIFF;
+                m_exportSpec->writerType = "sf";
+                m_exportSpec->extraFormat["filetype"] = "aiff";
                 m_exportSpec->extension = ".aiff";
                 break;
         case   2:
-               m_exportSpec->format = SF_FORMAT_FLAC;
+                m_exportSpec->writerType = "sf";
+                m_exportSpec->extraFormat["filetype"] = "flac";
                m_exportSpec->extension = ".flac";
                 break;
         }
@@ -196,23 +199,18 @@
        switch (bitdepthComboBox->currentIndex()) {
        //case          0:
        //        m_exportSpec->data_width = 8;
-       //        m_exportSpec->format |= SF_FORMAT_PCM_U8;
        //      break;
        case            0:
                m_exportSpec->data_width = 16;
-               m_exportSpec->format |= SF_FORMAT_PCM_16;
                break;
        case            1:
                m_exportSpec->data_width = 24;
-               m_exportSpec->format |= SF_FORMAT_PCM_24;
                break;
        case            2:
                m_exportSpec->data_width = 32;
-               m_exportSpec->format |= SF_FORMAT_PCM_32;
                break;
        case            3:
                m_exportSpec->data_width = 1;   // 1 means float
-               m_exportSpec->format |= SF_FORMAT_FLOAT;
                break;
        }
 
@@ -319,6 +317,8 @@
         show_settings_view();
        
        cdburningWidget->setEnabled(true);
+       
+       on_cancelButton_clicked();
 }
 
 void ExportWidget::set_exporting_song( Song * song )
@@ -530,8 +530,8 @@
                
                m_exportSpec->extension = ".wav";
                m_exportSpec->data_width = 16;
-               m_exportSpec->format = SF_FORMAT_WAV;
-               m_exportSpec->format |= SF_FORMAT_PCM_16;
+               m_exportSpec->writerType = "sf";
+               m_exportSpec->extraFormat["filetype"] = "wav";
                m_exportSpec->channels = 2;
                m_exportSpec->sample_rate = 44100;
                m_exportSpec->writeToc = true;