Changeset 2482

Timestamp:

04/02/12 22:45:04 (14 months ago)

Author:

wolke

Message:

change jacksession file handling. untitled song will saved into a jacksession without qmessage box question. remove white spaces from song-file names if they saved in a jack session.

Location:

trunk

Files:

• data/hydrogen.default.conf (modified) (1 diff)
• src/core/include/hydrogen/Preferences.h (modified) (2 diffs)
• src/core/src/IO/jack_output.cpp (modified) (3 diffs)
• src/core/src/preferences.cpp (modified) (3 diffs)
• src/gui/src/MainForm.cpp (modified) (3 diffs)
• src/gui/src/MainForm.h (modified) (1 diff)
• src/gui/src/PreferencesDialog.cpp (modified) (2 diffs)
• src/gui/src/UI/PreferencesDialog_UI.ui (modified) (1 diff)

trunk/data/hydrogen.default.conf

@@ -14 +14 @@
         <useLash>false</useLash>
         <useTimeLine>false</useTimeLine>
-        <maxBars>400</maxBars>
-        <JackSessionUseSessionDir>true</JackSessionUseSessionDir>
+        <maxBars>400</maxBars>
         <showDevelWarning>true</showDevelWarning>
         <hearNewNotes>true</hearNewNotes>

trunk/src/core/include/hydrogen/Preferences.h

@@ -587 +587 @@
         }
 
-        bool getJackSessionUseSessionDir(){
-            return m_bjackSessionUseSessionDir;
-        }
-        void setJackSessionUseSessionDir( bool val ){
-            m_bjackSessionUseSessionDir = val;
-        }
 #endif
 
@@ -659 +653 @@
         QString jackSessionUUID;
         QString jackSessionApplicationPath;
-        bool m_bjackSessionUseSessionDir;
 #endif
         bool waitingForSessionHandler;

trunk/src/core/src/IO/jack_output.cpp

@@ -759 +759 @@
         SAVE_SESSION,
         SAVE_AND_QUIT,
-        SAVE_TEMPLATE,
-        SAVE_SESSION_NEW_FILE
+        SAVE_TEMPLATE
     };
 
@@ -767 +766 @@
     /* Valid Song is needed */
     if(Hydrogen::get_instance()->getSong()->get_filename().isEmpty()){
-        EventQueue::get_instance()->push_event(EVENT_JACK_SESSION, SAVE_SESSION_NEW_FILE);
-        jack_session_reply(client, ev );
-        jack_session_event_free (ev);
-        return;
+            Hydrogen::get_instance()->getSong()->set_filename("Untitled_Song");
     }
+    if(Hydrogen::get_instance()->getSong()->get_filename().contains(" ")){
+            QStringList removeWhiteSpaces = Hydrogen::get_instance()->getSong()->get_filename().split(" ");
+            Hydrogen::get_instance()->getSong()->set_filename( removeWhiteSpaces.join("_") );
+    }
 
     QString songfilename;
-    if(Preferences::get_instance()->getJackSessionUseSessionDir()){
-        QString jackSessionDirectory = (QString)ev->session_dir;
-        QStringList list1 = Hydrogen::get_instance()->getSong()->get_filename().split("/");
-        QString realFillename = list1[list1.size()-1];
-        Hydrogen::get_instance()->getSong()->set_filename(jackSessionDirectory + realFillename);
-        songfilename = "\"${SESSION_DIR}\"" + realFillename;
-    }else
-    {
-        songfilename = Hydrogen::get_instance()->getSong()->get_filename();
-    }
-
+    QString jackSessionDirectory = (QString)ev->session_dir;
+    QStringList list1 = Hydrogen::get_instance()->getSong()->get_filename().split("/");
+    QString realFillename = list1[list1.size()-1];
+    Hydrogen::get_instance()->getSong()->set_filename(jackSessionDirectory + realFillename);
+    songfilename = "\"${SESSION_DIR}\"" + realFillename;
 
     QString retval = QString(Preferences::get_instance()->getJackSessionApplicationPath() + " -s" + songfilename + " --jacksessionid " + ev->client_uuid);
@@ -793 +787 @@
     }
     if (ev->type == JackSessionSaveAndQuit) {
-        if(Preferences::get_instance()->getJackSessionUseSessionDir()){
             EventQueue::get_instance()->push_event(EVENT_JACK_SESSION, SAVE_SESSION);
-        }
-        EventQueue::get_instance()->push_event(EVENT_JACK_SESSION, SAVE_AND_QUIT);
+            EventQueue::get_instance()->push_event(EVENT_JACK_SESSION, SAVE_AND_QUIT);
     }
 

trunk/src/core/src/preferences.cpp

@@ -73 +73 @@
         m_brestartLash = false;
         m_bsetLash = false;
-
-#ifdef H2CORE_HAVE_JACKSESSION
-        m_bjackSessionUseSessionDir = false;
-#endif
 
         //init pre delete default
@@ -410 +406 @@
                         hearNewNotes = LocalFileMng::readXmlBool( rootNode, "hearNewNotes", hearNewNotes );
                         quantizeEvents = LocalFileMng::readXmlBool( rootNode, "quantizeEvents", quantizeEvents );
-
-#ifdef H2CORE_HAVE_JACKSESSION
-                        m_bjackSessionUseSessionDir = LocalFileMng::readXmlBool( rootNode, "JackSessionUseSessionDir", m_bjackSessionUseSessionDir );
-#endif
                         
                         //rubberband
@@ -764 +756 @@
         LocalFileMng::writeXmlString( rootNode, "postDelete", QString("%1").arg(m_nRecPostDelete) );
 
-#ifdef H2CORE_HAVE_JACKSESSION
-        LocalFileMng::writeXmlString( rootNode, "JackSessionUseSessionDir", m_bjackSessionUseSessionDir ? "true": "false" );
-#endif
-
         //show development version warning
         LocalFileMng::writeXmlString( rootNode, "showDevelWarning", m_bShowDevelWarning ? "true": "false" );

trunk/src/gui/src/MainForm.cpp

@@ -487 +487 @@
 
         QString filename;
-        if (fd->exec() == QDialog::Accepted) {
+        if (fd->exec() == QDialog::Accepted) {
                 filename = fd->selectedFiles().first();
         }
@@ -511 +511 @@
         QString filename = song->get_filename();
 
-        if ( filename.isEmpty() ) {
-                // just in case!
-                return action_file_save_as();
-        }
+        if ( filename.isEmpty() ) {
+                // just in case!
+                return action_file_save_as();
+        }
 
         bool saved = false;
@@ -1469 +1469 @@
                       action_file_exit();
                       break;
-               case 3:
-                      action_file_save();
-                      QMessageBox::information( this, "Hydrogen", trUtf8( "Sorry, the Hydrogen-Songfile is not saved properly in this Jack-Session! You have to repeat the \"Save-Session\" procedure from your Jack-Session-Manager.") );
         }
 

trunk/src/gui/src/MainForm.h

@@ -68 +68 @@
                 void action_file_open();
                 void action_file_openDemo();
-                void action_file_save();
+                void action_file_save();
                 void action_file_save_as();
                 void action_file_openPattern();

trunk/src/gui/src/PreferencesDialog.cpp

@@ -261 +261 @@
 #endif
 
-#ifdef H2CORE_HAVE_JACKSESSION
-        useJackSessinStoreFiles->setVisible(true);
-        useJackSessinStoreFiles->setChecked(pPref->getJackSessionUseSessionDir());
-#else
-        useJackSessinStoreFiles->setVisible(false);
-#endif
-
         m_bNeedDriverRestart = false;
         connect(m_pMidiDriverComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT( onMidiDriverComboBoxIndexChanged(int) ));
@@ -421 +414 @@
         //path to rubberband
         pPref-> m_rubberBandCLIexecutable = rubberbandLineEdit->text();
-
-#ifdef H2CORE_HAVE_JACKSESSION
-        pPref->setJackSessionUseSessionDir(useJackSessinStoreFiles->isChecked());
-#endif
 
         //check preferences 

trunk/src/gui/src/UI/PreferencesDialog_UI.ui

@@ -331 +331 @@
      </property>
     </widget>
-    <widget class="QCheckBox" name="useJackSessinStoreFiles">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>100</y>
-       <width>511</width>
-       <height>31</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Save song files in Jack Session Directory (default on)</string>
-     </property>
-    </widget>
    </widget>
    <widget class="QWidget" name="tab_2">