comparison main/MainWindow.cpp @ 636:767789a78984 imaf_enc

Fix from Jesus Corral Garcia (for crashes etc)

 int mixrule_type, mixrule_par1, mixrule_par2, mixrule_par3, mixrule_par4;
 int group_tracks[maxtracks], group_volume;
 QString group_descr, group_name;
 int preset_type, fade_in;
 
+bool isIMAF;
 
 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) :
     MainWindowBase(withAudioOutput, withOSCSupport, true),
     m_overview(0),
     m_mainMenusCreated(false),

 
     group_descr = "Thisgroup";
 
     if( ImafFileName != "" ){   //if the user press cancel the function mainIMAFencoder won´t be called
         mainIMAFencoder(numtracks, files_paths, ImafFileName, ImageFileName, TextFileName,
-                        ImafVolumeValues, has_image, selrule_type, selrule_par1, selrule_par2,
+                        ImafVolumeValues, has_image, has_lyrics, selrule_type, selrule_par1, selrule_par2,
                         mixrule_type, mixrule_par1, mixrule_par2, mixrule_par3, mixrule_par4,
                         group_tracks, group_volume, group_name, group_descr, preset_type, fade_in);
     }
 }
 

     QString filename;
     int haslyrics; // if this variable != 2 -> there are lyrics
     filename = QFileDialog::getOpenFileName(this,
               tr("Import IMAF"), "/", tr("IMAF (*.ima)"));
 
+    if (filename.isEmpty()) return;
+    isIMAF = true;
+
     haslyrics = mainIMAFdecoder(filename);
 
     openMP3IMAF();
 
     if (haslyrics!=2){

 
           //editCurrentLayer();
 
           //text decoder
           unsigned char dat,dat1,dat2,dat3;
-          QTextStream out(stdout);
           FILE *imf;
           imf = fopen (filename.toStdString().c_str(),"rb");
 
           fseek (imf,0,SEEK_SET);
           fseek (imf,24,SEEK_CUR); //jump to 'mdat'