e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-02-02 15:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thestk/stk

Browse Source
This commit is contained in:
Gary Scavone
2014-03-12 13:30:49 -04:00
parent 0e7077c0f3 e2f4193e1a
commit 8658acabee
5 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.in
View File

@@ -55,6 +55,16 @@ ifeq ($(REALTIME),yes)
OBJECTS += RtMidi.o RtAudio.o RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
endif
BUILD_STATIC = @build_static@
BUILD_SHARED = @build_shared@
DEFAULT_TARGETS =
ifeq ($(BUILD_STATIC),yes)
DEFAULT_TARGETS += $(STATICLIB)
endif
ifeq ($(BUILD_SHARED),yes)
DEFAULT_TARGETS += $(SHAREDLIB)
endif
RAWWAVES = @rawwaves@
ifeq ($(strip $(RAWWAVES)), )
RAWWAVES = ../../rawwaves/
@@ -67,7 +77,7 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
%.o : ../src/include/%.cpp $(OBJECT_PATH)/.placeholder
$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
all : $(STATICLIB)
all : $(DEFAULT_TARGETS)
$(OBJECT_PATH)/.placeholder:
mkdir -vp $(OBJECT_PATH)

6
src/MidiFileIn.cpp
View File

@@ -232,7 +232,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
if ( !file_.read( (char *)&c, 1 ) ) goto error;
event->push_back( c );
if ( format_ != 1 && ( c == 0x51 ) ) isTempoEvent = true;
position = file_.tellg();
position = (unsigned long)file_.tellg();
if ( !readVariableLength( &bytes ) ) goto error;
bytes += ( (unsigned long)file_.tellg() - position );
file_.seekg( position, std::ios_base::beg );
@@ -242,7 +242,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
case 0xF7: // The start or continuation of a Sysex event
trackStatus_[track] = 0;
event->push_back( c );
position = file_.tellg();
position = (unsigned long)file_.tellg();
if ( !readVariableLength( &bytes ) ) goto error;
bytes += ( (unsigned long)file_.tellg() - position );
file_.seekg( position, std::ios_base::beg );
@@ -294,7 +294,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
}
// Save the current track pointer value.
trackPointers_[track] = file_.tellg();
trackPointers_[track] = (long)file_.tellg();
return ticks;