[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/applications/rosegarden/src
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-08-31 22:52:22
Message-ID: 20110831225222.93B81AC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1250647 by tpearson:

Fix rosegarden FTBFS


 M  +1 -1      document/io/LilyPondExporter.cpp  
 M  +3 -3      gui/rulers/ChordNameRuler.cpp  
 M  +1 -1      sequencer/main.cpp  


--- branches/trinity/applications/rosegarden/src/document/io/LilyPondExporter.cpp #1250646:1250647
@@ -2001,7 +2001,7 @@
                         if ((stringNum <= barreStart) && (stringNum >= barreEnd)) {
                             str << stringNum << "-" << barreFret << ";";
                         } else {
-                            str << stringNum << "-" << stringStatus << ";";
+                            str << stringNum << "-" << stringtqStatus << ";";
                         }
                     }
                 }
--- branches/trinity/applications/rosegarden/src/gui/rulers/ChordNameRuler.cpp #1250646:1250647
@@ -330,13 +330,13 @@
             NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, \
ignoring" << endl;  level = RecalcNone;
         } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" \
<< overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; +   \
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << \
overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;  \
                level = RecalcVisible;
         } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" \
<< overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; +            \
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << \
overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;  level = RecalcNone;
         } else {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" \
<< overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; +          \
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << \
overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;  level = \
RecalcWhole;  }
     }
--- branches/trinity/applications/rosegarden/src/sequencer/main.cpp #1250646:1250647
@@ -227,7 +227,7 @@
         if (roseSeq->checkExternalTransport()) {
             atLeisure = false;
         } else if (lastSeqtqStatus != roseSeq->gettqStatus()) {
-            SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << \
roseSeq->gettqStatus() << endl; +            SEQUENCER_DEBUG << "Sequencer status changed from " << \
lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl;  roseSeq->notifySequencertqStatus();
             lastSeqtqStatus = roseSeq->gettqStatus();
             atLeisure = false;


[prev in list] [next in list] [prev in thread] [next in thread]