[Traverso-commit] traverso/src core/Project.cpp core/Song.cpp cor...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/25 15:59:59

Modified files:
        src/core       : Project.cpp Song.cpp Song.h 
        src/traverso/ui: ProjectManagerDialog.ui 

Log message:
        * Do no allow renaming a projects title, it's not supported yet!
        * Fixed Song -> Sheet renaming in Project
        * Song: use correct transport control function to stop transport when 
starting project export

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ProjectManagerDialog.ui?cvsroot=traverso&r1=1.13&r2=1.14

Patches:
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- core/Project.cpp    21 Jun 2007 14:31:10 -0000      1.49
+++ core/Project.cpp    25 Jun 2007 15:59:59 -0000      1.50
@@ -394,7 +394,7 @@
        cmd = new AddRemove(this, song, historable, 0,
                "private_add_song(Song*)", "songAdded(Song*)",
                        "private_remove_song(Song*)", "songRemoved(Song*)",
-                       tr("Song %1 added").arg(song->get_title()));
+                       tr("Sheet %1 added").arg(song->get_title()));
        
        cmd->set_instantanious(true);
        
@@ -420,7 +420,7 @@
        }
        
        if (!newcurrent) {
-               info().information( tr("Song '%1' doesn't exist!").arg(id) );
+               info().information( tr("Sheet '%1' doesn't exist!").arg(id) );
                emit currentSongChanged(0);
                return;
        }
@@ -467,7 +467,7 @@
        cmd = new AddRemove(this, song, historable, 0,
                "private_remove_song(Song*)", "songRemoved(Song*)",
                "private_add_song(Song*)", "songAdded(Song*)",
-               tr("Remove Song %1").arg(song->get_title()));
+               tr("Remove Sheet %1").arg(song->get_title()));
        
        cmd->set_instantanious(true);
        
@@ -553,7 +553,7 @@
                spec->renderpass = ExportSpecification::WRITE_TO_HARDDISK;
                
                if (song->prepare_export(spec) < 0) {
-                       PERROR("Failed to prepare song for export");
+                       PERROR("Failed to prepare sheet for export");
                        break;
                }
                
@@ -561,9 +561,8 @@
                
                song->set_transport_pos(spec->resumeTransportFrame);
                if (spec->resumeTransport) {
-                       Command* k;
-                       if (!QMetaObject::invokeMethod(song, "go",  
Qt::QueuedConnection)) {
-                               printf("Invoking Song::go() failed\n");
+                       if (!QMetaObject::invokeMethod(song, "start_transport", 
 Qt::QueuedConnection)) {
+                               printf("Invoking Song::start_transport() 
failed\n");
                        }
                }
                if (spec->breakout) {

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- core/Song.cpp       25 Jun 2007 13:32:28 -0000      1.120
+++ core/Song.cpp       25 Jun 2007 15:59:59 -0000      1.121
@@ -334,7 +334,8 @@
        if ( ! (spec->renderpass == ExportSpecification::CREATE_CDRDAO_TOC) ) {
                if (is_transport_rolling()) {
                        spec->resumeTransport = true;
-                       stop_transport_rolling(false);
+                       // When transport is rolling, this equals stopping the 
transport!
+                       start_transport();
                }
                
                m_rendering = true;
@@ -1113,7 +1114,10 @@
        switch(state.tranport) {
        case TransportStopped:
                if (is_transport_rolling()) {
-                       stop_transport_rolling(state.realtime);
+                       stop_transport_rolling();
+                       if (is_recording()) {
+                               set_recording(false, state.realtime);
+                       }
                }
                return true;
        
@@ -1188,14 +1192,9 @@
 }
 
 // RT thread save function
-void Song::stop_transport_rolling(bool realtime)
+void Song::stop_transport_rolling()
 {
        m_stopTransport = 1;
-       
-       if (is_recording()) {
-               set_recording(false, realtime);
-       }
-       
        PMESG("tranport stopped");
 }
 

Index: core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- core/Song.h 25 Jun 2007 13:32:28 -0000      1.62
+++ core/Song.h 25 Jun 2007 15:59:59 -0000      1.63
@@ -200,7 +200,7 @@
        int finish_audio_export();
        void start_seek();
        void start_transport_rolling(bool realtime);
-       void stop_transport_rolling(bool realtime);
+       void stop_transport_rolling();
        
        void resize_buffer(bool updateArmStatus, nframes_t size);
 

Index: traverso/ui/ProjectManagerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ProjectManagerDialog.ui,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/ui/ProjectManagerDialog.ui 24 May 2007 11:53:25 -0000      1.13
+++ traverso/ui/ProjectManagerDialog.ui 25 Jun 2007 15:59:59 -0000      1.14
@@ -75,7 +75,14 @@
              </widget>
             </item>
             <item>
-             <widget class="QLineEdit" name="lineEditTitle" />
+             <widget class="QLineEdit" name="lineEditTitle" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
+              <property name="acceptDrops" >
+               <bool>false</bool>
+              </property>
+             </widget>
             </item>
            </layout>
           </item>