changeset 1032:b987cc23a26c imaf_enc

removed imaf sliders

--- a/.hgsubstate	Thu Dec 12 15:41:48 2013 +0000
+++ b/.hgsubstate	Tue Jul 14 15:04:46 2015 +0100
@@ -1,5 +1,5 @@
-236814e07bd07473958c1ff89103124536a0c3c8 dataquay
+6184e22a4f33b2c4b816e43c399bb9d7fede9775 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
-47964f188bd9cb2a75ad5c3783a86db76950a392 svapp
-786ee8d1f30e4920f361419a75eafa079ec0160d svcore
-97ea68f62c1f22c3732f939c512219426658efaf svgui
+428ce32a8dd9978e3dd6a471c82438e278cb1d40 svapp
+c475940aba799e3c2c380d1b06a8eedef13e3713 svcore
+282f4be8f0589a7b0744ba4ef7a838defc53ba4a svgui

--- a/main/MainWindow.cpp	Thu Dec 12 15:41:48 2013 +0000
+++ b/main/MainWindow.cpp	Tue Jul 14 15:04:46 2015 +0100
@@ -2929,7 +2929,7 @@
 
     QString path = getOpenFileName(FileFinder::AnyFile);
 
-    if (path.isEmpty()) return;
+        if (path.isEmpty()) return;
 
     FileOpenStatus status = open(path, ReplaceSession);
 
@@ -2943,9 +2943,9 @@
                               tr("<b>Audio required</b><p>Unable to load layer data from \"%1\" without an audio file.<br>Please load at least one audio file before importing annotations.").arg(path));
     }
 
-     files_paths[0] = path;
-     QTextStream out(stdout);
-     out << path;
+    files_paths[0] = path;
+    QTextStream out(stdout);
+    out << path;
 
 }
 
@@ -4902,15 +4902,13 @@
 void MainWindow::importIMAF()
 {
 
-    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;
+    QString path = getOpenFileName(FileFinder::IMAFile);
+
+    if (path.isEmpty()) return;
     isIMAF = true;
 
-    haslyrics = mainIMAFdecoder(filename);
+    haslyrics = mainIMAFdecoder(path);
 
     openMP3IMAF();
 
@@ -4938,7 +4936,7 @@
           //text decoder
           unsigned char dat,dat1,dat2,dat3;
           FILE *imf;
-          imf = fopen (filename.toStdString().c_str(),"rb");
+          imf = fopen (path.toStdString().c_str(),"rb");
 
           fseek (imf,0,SEEK_SET);
           fseek (imf,24,SEEK_CUR); //jump to 'mdat'