Menu
▾
▴
SF.net SVN: jazzplusplus:[907] trunk/jazz/src
|
From: <pst...@us...> - 2011-08-08 04:12:05
|
Revision: 907
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=907&view=rev
Author: pstieber
Date: 2011-08-08 04:11:58 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Changed int to long because they are the same size even on a 64-bit Windows platform.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/PortMidiPlayer.cpp
trunk/jazz/src/PortMidiPlayer.h
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/src/mswin/WindowsAudioInterface.h
trunk/jazz/src/mswin/WindowsConsole.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
trunk/jazz/src/mswin/WindowsPlayer.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Audio.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -622,7 +622,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSampleSet::StartPlay(long clock)
+void JZSampleSet::StartPlay(int clock)
{
ReloadSamples();
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Audio.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -344,7 +344,7 @@
virtual const std::string& GetSampleLabel(int Index);
- void StartPlay(long clock);
+ void StartPlay(int clock);
void StopPlay();
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Player.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -107,7 +107,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPlayLoop::Set(long Start, long Stop)
+void JZPlayLoop::Set(int Start, int Stop)
{
mStartClock = Start;
mStopClock = Stop;
@@ -115,7 +115,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPlayLoop::Ext2IntClock(long Clock)
+int JZPlayLoop::Ext2IntClock(int Clock)
{
if (mStopClock)
{
@@ -126,7 +126,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPlayLoop::Int2ExtClock(long Clock)
+int JZPlayLoop::Int2ExtClock(int Clock)
{
return Clock;
}
@@ -138,8 +138,8 @@
void JZPlayLoop::PrepareOutput(
JZEventArray* pEventArray,
JZSong* pSong,
- long ExtFr,
- long ExtTo,
+ int ExtFr,
+ int ExtTo,
bool AudioMode)
{
if (pEventArray == 0)
@@ -147,9 +147,9 @@
return;
}
- long From = Ext2IntClock(ExtFr);
- long Delta = ExtFr - From;
- long Size = ExtTo - ExtFr;
+ int From = Ext2IntClock(ExtFr);
+ int Delta = ExtFr - From;
+ int Size = ExtTo - ExtFr;
while (mStopClock && From + Size > mStopClock)
{
pSong->MergeTracks(
@@ -209,7 +209,7 @@
void JZPlayer::Notify()
{
// called by timer
- long Now = GetRealTimeClock();
+ int Now = GetRealTimeClock();
#ifdef DEBUG_PLAYER_NOTIFY
cout << "JZPlayer::Notify " << Now << endl;
@@ -301,7 +301,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
#ifdef DEBUG_PLAYER_STARTPLAY
cout << "JZPlayer::StartPlay" << endl;
@@ -608,7 +608,7 @@
Stop();
mPlaying = false;
- long Clock = GetRealTimeClock();
+ int Clock = GetRealTimeClock();
// SN++ Patch: Notes off for not GM/GS devices
int ii;
@@ -798,9 +798,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZMpuPlayer::StartPlay(long IntClock, long LoopClock, int Continue)
+void JZMpuPlayer::StartPlay(int IntClock, int LoopClock, int Continue)
{
- long ExtClock = mpPlayLoop->Int2ExtClock(IntClock);
+ int ExtClock = mpPlayLoop->Int2ExtClock(IntClock);
char *play;
int playsize;
@@ -1025,7 +1025,7 @@
ActiveTrack = 6;
}
- long Time = pEvent->GetClock() - TrackClock[ActiveTrack];
+ int Time = pEvent->GetClock() - TrackClock[ActiveTrack];
assert(Time < 240);
if (Stat != TrackRunningStatus[ActiveTrack])
@@ -1081,7 +1081,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZMpuPlayer::OutBreak(long BreakOver)
+void JZMpuPlayer::OutBreak(int BreakOver)
{
int OverFlow = 1;
@@ -1183,7 +1183,7 @@
//-----------------------------------------------------------------------------
// try to send all out of band events up to Clock to device
//-----------------------------------------------------------------------------
-void JZMpuPlayer::FlushOutOfBand(long Clock)
+void JZMpuPlayer::FlushOutOfBand(int Clock)
{
JZEventIterator Iterator(&OutOfBandEvents);
JZEvent* pEvent = Iterator.Range(0, Clock);
@@ -1229,10 +1229,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZMpuPlayer::GetRealTimeClock()
+int JZMpuPlayer::GetRealTimeClock()
{
static int receiving_song_ptr = 0;
- static long d0, d1;
+ static int d0, d1;
int c;
while ((c = RecBytes.Get(dev)) >= 0)
{
@@ -1278,7 +1278,7 @@
// Song pointer received
receiving_song_ptr++;
- long ExtClock;
+ int ExtClock;
switch (receiving_song_ptr)
{
@@ -1306,7 +1306,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZMpuPlayer::GetRecordedData()
+int JZMpuPlayer::GetRecordedData()
{
int c, i;
unsigned char *recbuf = NULL;
@@ -1862,7 +1862,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSeq2Player::OutBreak(long clock)
+void JZSeq2Player::OutBreak(int clock)
{
if (play_clock < clock)
{
@@ -1892,7 +1892,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSeq2Player::StartPlay(long Clock, long LoopClock, int Continue)
+void JZSeq2Player::StartPlay(int Clock, int LoopClock, int Continue)
{
char buf[512];
cout<<"JZSeq2Player::StartPlay"<<endl;
@@ -2018,7 +2018,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZSeq2Player::GetRealTimeClock()
+int JZSeq2Player::GetRealTimeClock()
{
unsigned char buf[256];
int size;
@@ -2036,7 +2036,7 @@
{
case TMR_WAIT_ABS:
case TMR_ECHO:
- recd_clock = *(unsigned long *)&buf[i+4] + start_clock;
+ recd_clock = *(unsigned int *)&buf[i+4] + start_clock;
break;
default:
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Player.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -102,30 +102,30 @@
JZPlayLoop();
- void Set(long Start, long Stop);
+ void Set(int Start, int Stop);
void Reset();
// external clock -> internal clock where
// external clock == physical clock
// internal clock == song position
- long Ext2IntClock(long Clock);
+ int Ext2IntClock(int Clock);
// the other way round
- long Int2ExtClock(long Clock);
+ int Int2ExtClock(int Clock);
void PrepareOutput(
JZEventArray* pEventArray,
JZSong* pSong,
- long ExtFr,
- long ExtTo,
+ int ExtFr,
+ int ExtTo,
bool AudioMode = false);
private:
- long mStartClock;
+ int mStartClock;
- long mStopClock;
+ int mStopClock;
};
//*****************************************************************************
@@ -163,9 +163,9 @@
void OutNow(JZTrack* t, JZParam* r);
// what's played right now?
- virtual long GetRealTimeClock() = 0;
+ virtual int GetRealTimeClock() = 0;
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
virtual void AllNotesOff(bool Reset = false);
@@ -255,7 +255,7 @@
virtual void ListenAudio(int key, int start_stop_mode = 1)
{
}
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl)
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl)
{
}
virtual bool IsListening() const
@@ -270,7 +270,7 @@
virtual void AdjustAudioLength(JZTrack *t)
{
- long ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
+ int ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
mSamples.AdjustAudioLength(t, ticks_per_minute);
}
@@ -291,7 +291,7 @@
mSamples.Edit(key);
}
- virtual long GetListenerPlayPosition()
+ virtual int GetListenerPlayPosition()
{
return -1L;
}
@@ -307,7 +307,7 @@
protected:
- long mOutClock;
+ int mOutClock;
JZPlayLoop* mpPlayLoop;
@@ -354,7 +354,7 @@
public:
- long Clock;
+ int Clock;
int RunningStatus;
void Clear()
@@ -398,9 +398,9 @@
return (int)sizeof(Buffer) - Written;
}
- void PutVar(long val)
+ void PutVar(int val)
{
- unsigned long buf;
+ unsigned int buf;
buf = val & 0x7f;
while ((val >>= 7) > 0)
{
@@ -419,9 +419,9 @@
}
}
- long GetVar(int dev)
+ int GetVar(int dev)
{
- unsigned long val;
+ unsigned int val;
int c;
val = Get(dev);
if (val & 0x80)
@@ -504,11 +504,11 @@
int dev;
JZBuffer PlyBytes;
JZBuffer RecBytes;
- long playclock;
+ int playclock;
int clock_to_host_counter;
int ActiveTrack;
- long TrackClock[ACTIVE_TRACKS];
+ int TrackClock[ACTIVE_TRACKS];
int TrackRunningStatus[ACTIVE_TRACKS];
JZEventArray OutOfBandEvents;
@@ -520,15 +520,15 @@
int OutEvent(JZEvent *e);
void OutNow(JZEvent *e);
void OutBreak();
- void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
virtual bool IsInstalled();
- long GetRecordedData();
+ int GetRecordedData();
void SetHardThru(int on, int idev, int odev);
- void FlushOutOfBand( long Clock );
+ void FlushOutOfBand( int Clock );
};
#define TRK (0<<6)
@@ -576,7 +576,7 @@
{
}
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0)
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0)
{
}
@@ -584,7 +584,7 @@
{
}
- long GetRealTimeClock()
+ int GetRealTimeClock()
{
return 0;
}
@@ -636,20 +636,20 @@
OutEvent(e, 1);
}
void OutBreak();
- void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
virtual void FlushToDevice();
void SetSoftThru(int on, int idev, int odev);
int FindMidiDevice();
protected:
- long play_clock;
- long recd_clock;
- long start_clock;
- long echo_clock;
+ int play_clock;
+ int recd_clock;
+ int start_clock;
+ int echo_clock;
JZOssThru *through;
int card_id;
Modified: trunk/jazz/src/PortMidiPlayer.cpp
===================================================================
--- trunk/jazz/src/PortMidiPlayer.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/PortMidiPlayer.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -401,7 +401,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPortMidiPlayer::GetRealTimeClock()
+int JZPortMidiPlayer::GetRealTimeClock()
{
long t = Pt_Time();
Modified: trunk/jazz/src/PortMidiPlayer.h
===================================================================
--- trunk/jazz/src/PortMidiPlayer.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/PortMidiPlayer.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -36,7 +36,7 @@
void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
int Clock2Time(int clock);
int Time2Clock(int time);
void SetTempo(int bpm, int clock);
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -76,8 +76,8 @@
JZAudioListener(
JZWindowsAudioPlayer* pPlayer,
JZSample& spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
: wxTimer(),
mpPlayer(pPlayer),
mCount(0),
@@ -123,7 +123,7 @@
}
}
- long GetPlayPosition()
+ int GetPlayPosition()
{
MMTIME mmtime;
mmtime.wType = TIME_SAMPLES;
@@ -135,11 +135,11 @@
JZWindowsAudioPlayer* mpPlayer;
- long mCount;
+ int mCount;
bool mHardExit;
- long mChannels;
+ int mChannels;
};
//-----------------------------------------------------------------------------
@@ -556,13 +556,13 @@
res = waveOutGetPosition(hout, &mmtime, sizeof(mmtime));
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
- long time_now = (long)timeGetTime();
- long audio_now = (long)(
+ int time_now = (int)timeGetTime();
+ int audio_now = (int)(
(double)start_time + 1000.0 * mmtime.u.sample /
mSamples.GetSamplingRate());
// low pass filter for time-correction (not really necessary)
- const long low = 50;
+ const int low = 50;
mpState->time_correction =
(low * mpState->time_correction +
(100 - low) * (audio_now - time_now) ) / 100L;
@@ -609,13 +609,13 @@
res = waveInGetPosition(hinp, &mmtime, sizeof(mmtime));
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
- long time_now = (long)timeGetTime();
- long audio_now = (long)(
+ int time_now = (int)timeGetTime();
+ int audio_now = (int)(
(double)mpState->start_time + 1000.0 * mmtime.u.sample /
mSamples.GetSamplingRate());
// Low pass filter for time-correction (not really necessary).
- const long low = 50;
+ const int low = 50;
mpState->time_correction =
(low * mpState->time_correction +
(100 - low) * (audio_now - time_now)) / 100L;
@@ -631,7 +631,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsAudioPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZWindowsAudioPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
mSamples.StartPlay(Clock);
JZWindowsIntPlayer::StartPlay(Clock, LoopClock, Continue);
@@ -665,11 +665,11 @@
mSamples.StopPlay();
if (RecordMode())
{
- long frc = mpRecordingInfo->mFromClock;
+ int frc = mpRecordingInfo->mFromClock;
if (frc < start_clock)
frc = start_clock;
- long toc = mpRecordingInfo->mToClock;
- long play_clock = Time2Clock(mpState->play_time);
+ int toc = mpRecordingInfo->mToClock;
+ int play_clock = Time2Clock(mpState->play_time);
if (toc > play_clock)
toc = play_clock;
mSamples.SaveRecordingDlg(frc, toc, recbuffers);
@@ -712,8 +712,8 @@
//-----------------------------------------------------------------------------
void JZWindowsAudioPlayer::ListenAudio(
JZSample &spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
{
if (!mAudioEnabled)
{
@@ -736,11 +736,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsAudioPlayer::GetListenerPlayPosition()
+int JZWindowsAudioPlayer::GetListenerPlayPosition()
{
if (!mpListener)
{
- return -1L;
+ return -1;
}
return mpListener->GetPlayPosition();
}
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -60,7 +60,7 @@
virtual void Notify();
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
@@ -83,9 +83,9 @@
virtual void ListenAudio(int key, int start_stop_mode = 1);
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl);
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl);
- virtual long GetListenerPlayPosition();
+ virtual int GetListenerPlayPosition();
virtual bool IsListening() const
{
@@ -141,11 +141,11 @@
// A value of false means MIDI only.
bool mAudioEnabled;
- long blocks_played; // # of blocks written to device
+ int blocks_played; // # of blocks written to device
int play_buffers_needed; // driver requests more output buffers
- long start_clock; // when did play start
- long start_time; // play start time (not altered by SetTempo)
+ int start_clock; // when did play start
+ int start_time; // play start time (not altered by SetTempo)
JZAudioListener* mpListener;
HWAVEOUT hout;
Modified: trunk/jazz/src/mswin/WindowsConsole.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsConsole.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsConsole.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -40,7 +40,7 @@
void RedirectIoToConsole()
{
int hConHandle;
- long lStdHandle;
+ HANDLE lStdHandle;
CONSOLE_SCREEN_BUFFER_INFO coninfo;
FILE *fp;
@@ -57,22 +57,22 @@
coninfo.dwSize);
// redirect unbuffered STDOUT to the console
- lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "w");
*stdout = *fp;
setvbuf(stdout, NULL, _IONBF, 0);
// redirect unbuffered STDIN to the console
- lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_INPUT_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "r");
*stdin = *fp;
setvbuf(stdin, NULL, _IONBF, 0);
// redirect unbuffered STDERR to the console
- lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_ERROR_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "w");
*stderr = *fp;
setvbuf(stderr, NULL, _IONBF, 0);
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -156,9 +156,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -215,7 +215,7 @@
(void)state->thru_buffer.get();
}
- state->play_time = (long)timeGetTime() + state->time_correction;
+ state->play_time = (int)timeGetTime() + state->time_correction;
midi_event* m = state->play_buffer.peek();
while (m)
@@ -253,15 +253,15 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (long)m->ref - (long)state->play_time;
+ delay = (int)m->ref - (int)state->play_time;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
state->min_timer_period,
@@ -279,9 +279,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -348,9 +348,9 @@
(void)state->thru_buffer.get();
}
- state->play_time = (long)timeGetTime();
+ state->play_time = (int)timeGetTime();
/* How many ticks since last signal? */
- long delta_clock = ((state->play_time - state->signal_time) * 1000L) / state->time_per_tick;
+ int delta_clock = ((state->play_time - state->signal_time) * 1000L) / state->time_per_tick;
if (delta_clock > (2 * state->ticks_per_signal)) /* Too many? */
{
@@ -364,7 +364,7 @@
midi_event *m = state->play_buffer.peek();
while (m)
{
- if ((long)m->ref > state->play_clock)
+ if ((int)m->ref > state->play_clock)
break;
if (m->data)
@@ -391,16 +391,16 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (((long)m->ref - state->play_clock) * state->time_per_tick) / 1000L;
+ delay = (((int)m->ref - state->play_clock) * state->time_per_tick) / 1000L;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
@@ -419,9 +419,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -476,7 +476,7 @@
state->mtc_start.type = ((u.c[1] & 0x06) >> 1);
if (state->qfm_bits == 0xff)
{
- long mtc_time;
+ int mtc_time;
state->signal_time = now;
Mtc2Frames( state );
GetMtcTime( state, mtc_time );
@@ -495,7 +495,7 @@
{
if (state->mtc_valid)
{
- long mtc_time;
+ int mtc_time;
GetMtcTime( state, mtc_time );
state->recd_buffer.put(dwParam1, mtc_time + (now - state->signal_time) );
}
@@ -549,7 +549,7 @@
(void)state->thru_buffer.get();
}
- long now = (long)timeGetTime();
+ int now = (int)timeGetTime();
if ( state->mtc_valid )
{
GetMtcTime( state, state->play_time );
@@ -592,15 +592,15 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (long)m->ref - (long)state->play_time;
+ delay = (int)m->ref - (int)state->play_time;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
state->min_timer_period,
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -320,16 +320,16 @@
HMIDIIN hinp;
HMIDIOUT hout;
- long start_time;
- long play_time;
- long start_clock;
- long ticks_per_minute;
+ int start_time;
+ int play_time;
+ int start_clock;
+ int ticks_per_minute;
- long play_clock;
- long virtual_clock;
- long ticks_per_signal;
- long signal_time;
- long time_per_tick;
+ int play_clock;
+ int virtual_clock;
+ int ticks_per_signal;
+ int signal_time;
+ int time_per_tick;
tWinPlayerMtcTime mtc_start;
DWORD mtc_frames;
@@ -349,7 +349,7 @@
JZMidiQueue thru_buffer;
JZWindowsAudioPlayer* audio_player;
- long time_correction;
+ int time_correction;
JZWinSysexBufferArray* isx_buffers;
JZWinSysexBufferArray* osx_buffers;
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -369,21 +369,21 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Clock2Time(long clock)
+int JZWindowsPlayer::Clock2Time(int clock)
{
if (clock < mpState->start_clock)
return mpState->start_time;
- return (long)( (double)(clock - mpState->start_clock) * 60000.0 /
+ return (int)( (double)(clock - mpState->start_clock) * 60000.0 /
(double)mpState->ticks_per_minute + mpState->start_time);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Time2Clock(long time)
+int JZWindowsPlayer::Time2Clock(int time)
{
if (time < mpState->start_time)
return mpState->start_clock;
- return (long)(
+ return (int)(
(double)(time - mpState->start_time) *
(double)mpState->ticks_per_minute / 60000.0 +
mpState->start_clock);
@@ -391,30 +391,30 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::SetTempo(long bpm, long clock)
+void JZWindowsPlayer::SetTempo(int bpm, int clock)
{
- long t1 = Clock2Time(clock);
- mpState->ticks_per_minute = (long)bpm * (long)mpSong->GetTicksPerQuarter();
- long t2 = Clock2Time(clock);
+ int t1 = Clock2Time(clock);
+ mpState->ticks_per_minute = (int)bpm * (int)mpSong->GetTicksPerQuarter();
+ int t2 = Clock2Time(clock);
mpState->start_time += (t1 - t2);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::RealTimeClock2Time(long clock)
+int JZWindowsPlayer::RealTimeClock2Time(int clock)
{
if (clock < mpState->start_clock)
return real_start_time;
- return (long)( (double)(clock - mpState->start_clock) * 60000.0 / (double)real_ticks_per_minute + real_start_time);
+ return (int)( (double)(clock - mpState->start_clock) * 60000.0 / (double)real_ticks_per_minute + real_start_time);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Time2RealTimeClock(long time)
+int JZWindowsPlayer::Time2RealTimeClock(int time)
{
if (time < real_start_time)
return mpState->start_clock;
- return (long)(
+ return (int)(
(double)(time - real_start_time) *
(double)real_ticks_per_minute / 60000.0 +
mpState->start_clock);
@@ -422,11 +422,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::SetRealTimeTempo(long bpm, long clock)
+void JZWindowsPlayer::SetRealTimeTempo(int bpm, int clock)
{
- long t1 = RealTimeClock2Time(clock);
- real_ticks_per_minute = (long)bpm * (long)mpSong->GetTicksPerQuarter();
- long t2 = RealTimeClock2Time(clock);
+ int t1 = RealTimeClock2Time(clock);
+ real_ticks_per_minute = (int)bpm * (int)mpSong->GetTicksPerQuarter();
+ int t2 = RealTimeClock2Time(clock);
real_start_time += (t1 - t2);
}
@@ -532,7 +532,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::FillMidiClocks(long to)
+void JZWindowsPlayer::FillMidiClocks(int to)
{
while (midiClockOut <= to)
{
@@ -545,7 +545,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::OutBreak(long clock)
+void JZWindowsPlayer::OutBreak(int clock)
{
if (gpConfig->GetValue(C_RealTimeOut))
{
@@ -560,7 +560,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsMidiPlayer::OutBreak(long clock)
+void JZWindowsMidiPlayer::OutBreak(int clock)
{
if (gpConfig->GetValue(C_RealTimeOut))
{
@@ -607,7 +607,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZWindowsPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
mpState->play_buffer.clear();
mpState->recd_buffer.clear();
@@ -637,7 +637,7 @@
}
else
{
- mpState->start_time = (long)timeGetTime() + 500;
+ mpState->start_time = (int)timeGetTime() + 500;
real_start_time = mpState->start_time;
mpState->start_clock = Clock;
}
@@ -800,7 +800,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::FlushToDevice(long clock)
+void JZWindowsPlayer::FlushToDevice(int clock)
{
JZEventIterator Iterator(&mPlayBuffer);
JZEvent* pEvent = Iterator.Range(0, clock);
@@ -819,7 +819,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsIntPlayer::GetRealTimeClock()
+int JZWindowsIntPlayer::GetRealTimeClock()
{
while (!mpState->recd_buffer.empty())
{
@@ -834,8 +834,8 @@
}
}
- long clock = Time2RealTimeClock(
- (long)timeGetTime() + mpState->time_correction);
+ int clock = Time2RealTimeClock(
+ (int)timeGetTime() + mpState->time_correction);
JZProjectManager::Instance()->NewPlayPosition(
mpPlayLoop->Ext2IntClock(clock / 48 * 48));
@@ -865,9 +865,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsMidiPlayer::GetRealTimeClock()
+int JZWindowsMidiPlayer::GetRealTimeClock()
{
- long clock;
+ int clock;
while (!mpState->recd_buffer.empty())
{
@@ -889,7 +889,7 @@
gpMidiPlayer->StopPlay();
u.w = m->data;
clock =
- ((long)u.c[1] + (128L * (long)u.c[2])) *
+ ((int)u.c[1] + (128L * (int)u.c[2])) *
(mpSong->GetTicksPerQuarter() / 4);
gpMidiPlayer->StartPlay( clock, 0, 1 );
return -1;
@@ -904,7 +904,7 @@
}
}
- long delta_clock = (((long)timeGetTime() - mpState->signal_time) * 1000L) / mpState->time_per_tick;
+ int delta_clock = (((int)timeGetTime() - mpState->signal_time) * 1000L) / mpState->time_per_tick;
if (delta_clock > (2 * mpState->ticks_per_signal))
{
@@ -923,9 +923,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsMtcPlayer::GetRealTimeClock()
+int JZWindowsMtcPlayer::GetRealTimeClock()
{
- long clock;
+ int clock;
while (!mpState->recd_buffer.empty())
{
@@ -951,7 +951,7 @@
if (mpState->mtc_valid)
{
- if ( ((long)timeGetTime() - mpState->signal_time) > 500 )
+ if ( ((int)timeGetTime() - mpState->signal_time) > 500 )
{
/* Assume tape stopped */
disable();
@@ -1017,7 +1017,7 @@
StopPlay();
mpState->doing_mtc_rec = FALSE;
return(new JZMtcTime(
- (long) GetMtcTime(mpState),
+ (int) GetMtcTime(mpState),
(tMtcType) mpState->mtc_start.type));
}
Modified: trunk/jazz/src/mswin/WindowsPlayer.h
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsPlayer.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -47,10 +47,10 @@
void OutNow(JZEvent *e);
void OutNow(JZParam *r);
void OutBreak();
- virtual void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- virtual long GetRealTimeClock() = 0;
+ virtual int GetRealTimeClock() = 0;
virtual void FlushToDevice();
void SetSoftThru(int on, int InputDevice, int OutputDevice);
@@ -75,21 +75,21 @@
tWinPlayerState* mpState;
DWORD Event2Dword(JZEvent *e);
JZEvent* Dword2Event(DWORD dw);
- long Clock2Time(long clock);
- long Time2Clock(long time);
- void SetTempo(long bpm, long clock);
+ int Clock2Time(int clock);
+ int Time2Clock(int time);
+ void SetTempo(int bpm, int clock);
BOOL timer_installed;
- long midiClockOut;
- long lastValidMtcClock;
- void FillMidiClocks(long to);
- void FlushToDevice(long clock);
+ int midiClockOut;
+ int lastValidMtcClock;
+ void FillMidiClocks(int to);
+ void FlushToDevice(int clock);
JZEventArray OutOfBandEvents;
- long RealTimeClock2Time(long clock);
- long Time2RealTimeClock(long time);
- void SetRealTimeTempo(long bpm, long clock);
- long real_start_time;
- long real_ticks_per_minute;
+ int RealTimeClock2Time(int clock);
+ int Time2RealTimeClock(int time);
+ void SetRealTimeTempo(int bpm, int clock);
+ int real_start_time;
+ int real_ticks_per_minute;
// buffer for sysexdata
HANDLE hSysHdr;
@@ -110,7 +110,7 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
};
//*****************************************************************************
@@ -124,9 +124,9 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
virtual int OutEvent(JZEvent* pEvent);
- virtual void OutBreak(long clock);
+ virtual void OutBreak(int clock);
};
//*****************************************************************************
@@ -139,7 +139,7 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
virtual void InitMtcRec();
virtual JZMtcTime* FreezeMtcRec();
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
