summaryrefslogtreecommitdiffstats
path: root/src/sound/MidiFile.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-02 22:38:52 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-02 22:38:52 +0000
commit458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch)
tree624583f2873febe23770bee3fa94b5c24bd59f4f /src/sound/MidiFile.cpp
parent747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff)
downloadrosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz
rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip
Initial TQt4 port of Rosegarden
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/sound/MidiFile.cpp')
-rw-r--r--src/sound/MidiFile.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index 76d5c85..4e97455 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -171,7 +171,7 @@ MidiFile::getMidiByte(ifstream* midiFile)
emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
}
return (MidiByte)byte;
@@ -249,7 +249,7 @@ MidiFile::getMidiBytes(ifstream* midiFile, unsigned long numberOfBytes)
if (bytesGot % 2000 == 0) {
emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
}
return stringRet;
@@ -464,7 +464,7 @@ MidiFile::parseHeader(const string &midiHeader)
m_numberOfTracks = midiBytesToInt(midiHeader.substr(10, 2));
m_timingDivision = midiBytesToInt(midiHeader.substr(12, 2));
- if ( m_format == MIDI_SEQUENTIAL_TRACK_FILE ) {
+ if ( m_format == MIDI_SETQUENTIAL_TRACK_FILE ) {
#ifdef MIDI_DEBUG
std::cerr << "MidiFile::parseHeader()"
<< "- can't load sequential track file"
@@ -503,7 +503,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
unsigned long accumulatedTime = 0;
// The trackNum passed in to this method is the default track for
- // all events provided they're all on the same channel. If we find
+ // all events provided they're all on the same channel. If we tqfind
// events on more than one channel, we increment trackNum and record
// the mapping from channel to trackNum in this channelTrackMap.
// We then return the new trackNum by reference so the calling
@@ -524,7 +524,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
TrackId metaTrack = lastTrackNum;
// Remember the last non-meta status byte (-1 if we haven't seen one)
- int runningStatus = -1;
+ int runningtqStatus = -1;
bool firstTrack = true;
@@ -550,11 +550,11 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
midiByte = getMidiByte(midiFile);
if (!(midiByte & MIDI_STATUS_BYTE_MASK)) {
- if (runningStatus < 0) {
+ if (runningtqStatus < 0) {
throw (Exception("Running status used for first event in track"));
}
- eventCode = (MidiByte)runningStatus;
+ eventCode = (MidiByte)runningtqStatus;
data1 = midiByte;
#ifdef MIDI_DEBUG
@@ -603,7 +603,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
} else // the rest
{
- runningStatus = eventCode;
+ runningtqStatus = eventCode;
MidiEvent *midiEvent;
@@ -842,7 +842,7 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// split over these tracks
emit setProgress(20 +
(int)((80.0 * double(i) / double(m_numberOfTracks))));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
// Convert the deltaTime to an absolute time since
// the start of the segment. The addTime method
@@ -2120,7 +2120,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
if (progressCount % 500 == 0) {
emit setProgress(progressCount * 100 / progressTotal);
- kapp->processEvents(500);
+ kapp->tqprocessEvents(500);
}
}