Menu
▾
▴
jazzplusplus-updates — SVN commit message list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
| 2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pst...@us...> - 2010-07-12 04:26:33
|
Revision: 793
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=793&view=rev
Author: pstieber
Date: 2010-07-12 04:26:27 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
Changed BitsPerSample to GetBitsPerSample.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.cpp
trunk/jazz/src/AudioDriver.cpp
Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp 2010-07-12 04:24:15 UTC (rev 792)
+++ trunk/jazz/src/AlsaDriver.cpp 2010-07-12 04:26:27 UTC (rev 793)
@@ -251,7 +251,7 @@
snd_pcm_uframes_t buffer_size, period_size;
frame_shift[mode] = 0;
- if (mSamples.BitsPerSample() == 8)
+ if (mSamples.GetBitsPerSample() == 8)
{
format = SND_PCM_FORMAT_U8;
}
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2010-07-12 04:24:15 UTC (rev 792)
+++ trunk/jazz/src/AudioDriver.cpp 2010-07-12 04:26:27 UTC (rev 793)
@@ -282,9 +282,9 @@
perror("ioctl DSP_SETFRAGMENT");
}
- tmp = mSamples.BitsPerSample();
+ tmp = mSamples.GetBitsPerSample();
ioctl(dev, SNDCTL_DSP_SAMPLESIZE, &tmp);
- if (tmp != mSamples.BitsPerSample())
+ if (tmp != mSamples.GetBitsPerSample())
{
cerr << "Unable to set the sample size" << endl;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-12 04:24:21
|
Revision: 792
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=792&view=rev
Author: pstieber
Date: 2010-07-12 04:24:15 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
1. Changed the tSampleSet data member bits to mBitsPerSample.
2. Changed tSampleSet::BitsPerSample to tSampleSet::GetBitsPerSample.
3. Changed tSampleSet::clocks_per_buffer to tSampleSet::mClocksPerBuffer and added
tSampleSet::GetClocksPerBuffer
4. Removed friend status of tSample and tSampleVoice from tSampleSet.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Sample.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Audio.cpp 2010-07-12 04:24:15 UTC (rev 792)
@@ -90,7 +90,7 @@
return;
// not this buffer
- if (buffer_clock + set.clocks_per_buffer <= clock)
+ if (buffer_clock + set.GetClocksPerBuffer() <= clock)
return;
// compute offset in buffer
@@ -191,7 +191,10 @@
tSampleSet::tSampleSet(long tpm)
: mSamplingRate(22050),
mChannelCount(1),
- bits(16), // dont change!!
+
+ // Dont change!!!
+ mBitsPerSample(16),
+
softsync(1),
mpSampleDialog(0),
mDefaultFileName("noname.spl"),
@@ -413,7 +416,7 @@
ticks_per_minute = tpm;
event_index = 0;
bufshorts = BUFSHORTS;
- clocks_per_buffer = Samples2Ticks(bufshorts);
+ mClocksPerBuffer = Samples2Ticks(bufshorts);
num_voices = 0;
return 0;
}
@@ -428,7 +431,7 @@
return 1;
}
bufshorts = bufsize / 2;
- clocks_per_buffer = Samples2Ticks(bufshorts);
+ mClocksPerBuffer = Samples2Ticks(bufshorts);
return 0;
}
@@ -454,7 +457,8 @@
}
else
{
- nfree = (int)((last_clock - start_clock) / clocks_per_buffer) - buffers_written;
+ nfree = (int)(
+ (last_clock - start_clock) / mClocksPerBuffer) - buffers_written;
}
if (nfree <= 0)
@@ -1024,8 +1028,8 @@
wh.modus = mChannelCount;
wh.sc_len = 16;
wh.sample_fq = mSamplingRate;
- wh.bit_p_spl = bits;
- wh.byte_p_spl = mChannelCount * (bits > 8 ? 2 : 1);
+ wh.bit_p_spl = mBitsPerSample;
+ wh.byte_p_spl = mChannelCount * (mBitsPerSample > 8 ? 2 : 1);
wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Audio.h 2010-07-12 04:24:15 UTC (rev 792)
@@ -223,8 +223,6 @@
{
private:
- friend class tSampleVoice;
- friend class tSample;
friend class JZWindowsAudioPlayer;
friend class tAudioPlayer;
friend class tAlsaAudioPlayer;
@@ -273,11 +271,16 @@
mChannelCount = ChannelCount;
}
- int BitsPerSample() const
+ int GetBitsPerSample() const
{
- return bits;
+ return mBitsPerSample;
}
+ double GetClocksPerBuffer() const
+ {
+ return mClocksPerBuffer;
+ }
+
bool GetSoftSync() const
{
return softsync;
@@ -385,12 +388,12 @@
long SampleSize(long num_samples)
{
- return mChannelCount * (bits == 8 ? 1L : 2L) * num_samples;
+ return mChannelCount * (mBitsPerSample == 8 ? 1L : 2L) * num_samples;
}
long BufferClock(int i) const
{
- return (long)(start_clock + i * clocks_per_buffer);
+ return (long)(start_clock + i * mClocksPerBuffer);
}
void SamplesDlg();
@@ -403,14 +406,16 @@
// mono = 1, stereo = 2
int mChannelCount;
- int bits; // must be 16!
+ // This must be 16!
+ int mBitsPerSample;
+
bool softsync; // enable software midi/audio sync
tSample* mSamples[eSampleCount];
tSampleWin* mSampleWindows[eSampleCount];
long ticks_per_minute; // MIDI sampling rate for audio/midi sync.
- double clocks_per_buffer;
+ double mClocksPerBuffer;
long start_clock; // when did play start
int event_index;
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Sample.cpp 2010-07-12 04:24:15 UTC (rev 792)
@@ -693,19 +693,20 @@
int tSample::SaveWave()
{
WaveHeader wh;
- wh.main_chunk = RIFF;
- wh.chunk_type = WAVE;
- wh.sub_chunk = FMT;
- wh.data_chunk = DATA;
- wh.format = PCM_CODE;
- wh.modus = set.GetChannelCount();
- wh.sc_len = 16;
- wh.sample_fq = set.GetSamplingRate();
- wh.bit_p_spl = set.bits;
- wh.byte_p_spl = set.GetChannelCount() * (set.bits > 8 ? 2 : 1);
- wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
+ wh.main_chunk = RIFF;
+ wh.chunk_type = WAVE;
+ wh.sub_chunk = FMT;
+ wh.data_chunk = DATA;
+ wh.format = PCM_CODE;
+ wh.modus = set.GetChannelCount();
+ wh.sc_len = 16;
+ wh.sample_fq = set.GetSamplingRate();
+ wh.bit_p_spl = set.GetBitsPerSample();
+ wh.byte_p_spl =
+ set.GetChannelCount() * (set.GetBitsPerSample() > 8 ? 2 : 1);
+ wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
wh.data_length = length * sizeof(short);
- wh.length = wh.data_length + sizeof(WaveHeader);
+ wh.length = wh.data_length + sizeof(WaveHeader);
#ifdef __WXMSW__
unlink(mFileName.c_str()); // buggy, sigh!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-12 01:55:17
|
Revision: 791
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=791&view=rev
Author: pstieber
Date: 2010-07-12 01:55:11 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
Updated the Linux version.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.cpp
trunk/jazz/src/AlsaDriver.h
trunk/jazz/src/AudioDriver.cpp
trunk/jazz/src/AudioDriver.h
Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp 2010-07-12 01:21:59 UTC (rev 790)
+++ trunk/jazz/src/AlsaDriver.cpp 2010-07-12 01:55:11 UTC (rev 791)
@@ -127,7 +127,7 @@
{
mpAudioBuffer = new tEventArray();
mInstalled = false;
- audio_enabled = 0;
+ mAudioEnabled = false;
mpListener = 0;
mCanDuplex = 0; // no duplex yet.
pcm[PLAYBACK] = NULL;
@@ -139,7 +139,7 @@
// FIXME
mCanDuplex = 1;
mInstalled = true;
- audio_enabled = 1;
+ mAudioEnabled = true;
}
@@ -181,7 +181,7 @@
mSamples.StartPlay(clock);
tAlsaPlayer::StartPlay(clock, loopClock, cont);
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -213,7 +213,7 @@
if (running_mode == 0)
{
- audio_enabled = 0;
+ mAudioEnabled = false;
return;
}
@@ -241,7 +241,7 @@
void tAlsaAudioPlayer::OpenDsp(int mode, int sync_mode)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -260,7 +260,7 @@
format = SND_PCM_FORMAT_S16_LE;
frame_shift[mode]++;
}
- channels = mSamples.GetChannels();
+ channels = mSamples.GetChannelCount();
if (channels > 1)
{
frame_shift[mode]++;
@@ -276,7 +276,7 @@
SND_PCM_NONBLOCK) < 0)
{
perror("snd_pcm_open");
- audio_enabled = 0;
+ mAudioEnabled = false;
return;
}
@@ -298,9 +298,11 @@
perror("cannot set audio channels");
goto __error;
}
- if (snd_pcm_hw_params_set_rate(pcm[mode], hw, mSamples.GetSpeed(), 0) < 0)
+ if (
+ snd_pcm_hw_params_set_rate(pcm[mode], hw, mSamples.GetSamplingRate(), 0) <
+ 0)
{
- cerr << "cannot set audio rate: " << mSamples.GetSpeed() << endl;
+ cerr << "cannot set audio rate: " << mSamples.GetSamplingRate() << endl;
goto __error;
}
@@ -354,7 +356,7 @@
__error:
snd_pcm_close(pcm[mode]);
pcm[mode] = NULL;
- audio_enabled = 0;
+ mAudioEnabled = false;
return;
}
@@ -405,7 +407,7 @@
void tAlsaAudioPlayer::Notify()
{
- if (audio_enabled)
+ if (mAudioEnabled)
{
if (pcm[PLAYBACK])
{
@@ -446,7 +448,7 @@
int tAlsaAudioPlayer::WriteSamples()
{
- if (!audio_enabled || pcm[PLAYBACK] == NULL)
+ if (!mAudioEnabled || pcm[PLAYBACK] == NULL)
{
return 0;
}
@@ -495,7 +497,7 @@
void tAlsaAudioPlayer::ReadSamples()
{
- if (!audio_enabled || pcm[CAPTURE] == NULL)
+ if (!mAudioEnabled || pcm[CAPTURE] == NULL)
{
return;
}
@@ -535,7 +537,7 @@
void tAlsaAudioPlayer::MidiSync()
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -615,7 +617,7 @@
{
mSamples.StopPlay();
tAlsaPlayer::StopPlay();
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -640,7 +642,7 @@
void tAlsaAudioPlayer::ListenAudio(int key, int start_stop_mode)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -670,7 +672,7 @@
void tAlsaAudioPlayer::ListenAudio(tSample& spl, long fr_smpl, long to_smpl)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
Modified: trunk/jazz/src/AlsaDriver.h
===================================================================
--- trunk/jazz/src/AlsaDriver.h 2010-07-12 01:21:59 UTC (rev 790)
+++ trunk/jazz/src/AlsaDriver.h 2010-07-12 01:55:11 UTC (rev 791)
@@ -47,13 +47,13 @@
{
return mInstalled && tAlsaPlayer::IsInstalled();
}
- virtual int GetAudioEnabled() const
+ virtual bool GetAudioEnabled() const
{
- return audio_enabled;
+ return mAudioEnabled;
}
- virtual void SetAudioEnabled(int x)
+ virtual void SetAudioEnabled(bool AudioEnabled)
{
- audio_enabled = x;
+ mAudioEnabled = AudioEnabled;
}
virtual void ListenAudio(int key, int start_stop_mode = 1);
virtual void ListenAudio(tSample &spl, long fr_smpl, long to_smpl);
@@ -100,8 +100,10 @@
int running_mode;
int midi_speed; // start speed in bpm
int curr_speed; // actual speed in bpm
- int audio_enabled; // 0 means midi only
+ // False means MIDI only.
+ bool mAudioEnabled;
+
int card; // card number in config
std::string mDeviceNames[2]; // device names
long frag_size[2];
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2010-07-12 01:21:59 UTC (rev 790)
+++ trunk/jazz/src/AudioDriver.cpp 2010-07-12 01:55:11 UTC (rev 791)
@@ -121,11 +121,9 @@
tAudioPlayer::tAudioPlayer(JZSong* pSong)
: tSeq2Player(pSong)
{
- long dummy = 0;
mpAudioBuffer = new tEventArray();
mInstalled = false;
- dummy = gpConfig->GetValue(C_EnableAudio);
- audio_enabled = dummy;
+ mAudioEnabled = (gpConfig->GetValue(C_EnableAudio) != 0);
mpListener = 0;
mCanDuplex = 0; // no duplex yet.
dev = -1;
@@ -164,7 +162,7 @@
}
dev = -1; // closed
- audio_enabled = audio_enabled && mInstalled;
+ mAudioEnabled = mAudioEnabled && mInstalled;
}
@@ -191,7 +189,7 @@
void tAudioPlayer::StartAudio()
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -233,7 +231,7 @@
{
int tmp;
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -269,7 +267,7 @@
if (dev < 0)
{
perror(AUDIO_DEVICE);
- audio_enabled = 0;
+ mAudioEnabled = false;
return;
}
@@ -291,13 +289,13 @@
cerr << "Unable to set the sample size" << endl;
}
- tmp = (mSamples.GetChannels() == 1) ? 0 : 1;
+ tmp = (mSamples.GetChannelCount() == 1) ? 0 : 1;
if (ioctl (dev, SNDCTL_DSP_STEREO, &tmp) == -1)
{
cerr << "Unable to set mono/stereo" << endl;
}
- tmp = mSamples.GetSpeed();
+ tmp = mSamples.GetSamplingRate();
if (ioctl (dev, SNDCTL_DSP_SPEED, &tmp) == -1)
{
perror("ioctl DSP_SPEED");
@@ -346,7 +344,7 @@
void tAudioPlayer::Notify()
{
- if (audio_enabled)
+ if (mAudioEnabled)
{
if (PlaybackMode())
{
@@ -373,7 +371,7 @@
int tAudioPlayer::WriteSamples()
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return 0;
}
@@ -451,7 +449,7 @@
// everything works. In OSS, there are no docs and if it works
// with kernel x it wont with kernel y.
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -525,7 +523,7 @@
{
mSamples.StopPlay();
tSeq2Player::StopPlay();
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -552,7 +550,7 @@
void tAudioPlayer::ListenAudio(int key, int start_stop_mode)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -582,7 +580,7 @@
void tAudioPlayer::ListenAudio(tSample &spl, long fr_smpl, long to_smpl)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
Modified: trunk/jazz/src/AudioDriver.h
===================================================================
--- trunk/jazz/src/AudioDriver.h 2010-07-12 01:21:59 UTC (rev 790)
+++ trunk/jazz/src/AudioDriver.h 2010-07-12 01:55:11 UTC (rev 791)
@@ -65,14 +65,14 @@
return mInstalled && tSeq2Player::IsInstalled();
}
- virtual int GetAudioEnabled() const
+ virtual bool GetAudioEnabled() const
{
- return audio_enabled;
+ return mAudioEnabled;
}
- virtual void SetAudioEnabled(int x)
+ virtual void SetAudioEnabled(bool AudioEnabled)
{
- audio_enabled = x;
+ mAudioEnabled = AudioEnabled;
}
virtual void ListenAudio(int key, int start_stop_mode = 1);
@@ -113,8 +113,10 @@
long audio_bytes;
int midi_speed; // start speed in bpm
int curr_speed; // actual speed in bpm
- int audio_enabled; // 0 means midi only
+ // False means MIDI only.
+ int mAudioEnabled;
+
tAudioListener* mpListener;
tAudioRecordBuffer recbuffers;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-12 01:22:05
|
Revision: 790
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=790&view=rev
Author: pstieber
Date: 2010-07-12 01:21:59 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
1. Added a new audio settings dialog. I added the controls, but it isn't functional.
2. Reordered includes, removed an unused macro, and updated the tSampleVoice class comment
header in Audio.cpp.
3. Changed speed to mSamplingRate in tSampleSet and renamed the accessors and mutators accordingly.
4. Changed channels to mChannelCount in tSampleSet and renamed the accessors and mutators accordingly.
5. Changed GetAudioEnabled and SetAudioEnabled to use bool instead of int.
3.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Makefile.am
trunk/jazz/src/Player.h
trunk/jazz/src/Sample.cpp
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleCommand.cpp
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/Signal2.cpp
trunk/jazz/src/Signal2.h
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/src/mswin/WindowsAudioInterface.h
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/AudioSettingsDialog.cpp
trunk/jazz/src/Dialogs/AudioSettingsDialog.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Audio.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -22,22 +22,23 @@
#include "Audio.h"
+#include "Dialogs/AudioSettingsDialog.h"
#include "Dialogs/SamplesDialog.h"
-#include "Sample.h"
#include "Events.h"
-#include "RecordingInfo.h"
-#include "Track.h"
+#include "FileSelector.h"
+#include "FindFile.h"
#include "Globals.h"
+#include "Help.h"
#include "Player.h"
-#include "TrackFrame.h"
-#include "TrackWindow.h"
-#include "SampleWindow.h"
#include "Random.h"
-#include "FindFile.h"
-#include "FileSelector.h"
-#include "StringReadWrite.h"
-#include "Help.h"
+#include "RecordingInfo.h"
#include "Resources.h"
+#include "Sample.h"
+#include "SampleWindow.h"
+#include "StringReadWrite.h"
+#include "Track.h"
+#include "TrackFrame.h"
+#include "TrackWindow.h"
#include <wx/filename.h>
#include <wx/listbox.h>
@@ -56,18 +57,17 @@
using namespace std;
-#define db(a) cout << #a << " = " << a << endl
-
//*****************************************************************************
+// Description:
+// This is the sample voice class declaration. This class is activated via a
+// MIDI note on signal. The class copies data from a tSample object to the
+// output buffer as needed by the driver.
//*****************************************************************************
class tSampleVoice
{
- // Activated on note on. Copies data from a tSample object to the output
- // buffer as needed by the driver.
-
public:
- tSampleVoice(tSampleSet &s)
+ tSampleVoice(tSampleSet& s)
: set(s)
{
}
@@ -189,11 +189,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
tSampleSet::tSampleSet(long tpm)
- : speed(22050),
- channels(1),
+ : mSamplingRate(22050),
+ mChannelCount(1),
bits(16), // dont change!!
softsync(1),
- mpGlobalSettingsDialog(0),
mpSampleDialog(0),
mDefaultFileName("noname.spl"),
mRecordFileName("noname.wav")
@@ -291,7 +290,7 @@
ifstream Is(FileName.c_str());
int Version;
- Is >> Version >> speed >> channels >> softsync;
+ Is >> Version >> mSamplingRate >> mChannelCount >> softsync;
while (Is)
{
int key, pan, vol, pitch;
@@ -361,7 +360,9 @@
int tSampleSet::Save(const wxString& FileName)
{
ofstream Ofs(FileName.c_str());
- Ofs << 1 << ' ' << speed << ' ' << channels << ' ' << softsync << endl;
+ Ofs
+ << 1 << ' ' << mSamplingRate << ' ' << mChannelCount << ' ' << softsync
+ << endl;
for (int i = 0; i < eSampleCount; i++)
{
tSample* pSample = mSamples[i];
@@ -518,8 +519,8 @@
}
//-----------------------------------------------------------------------------
-// returns the number of buffers containing sound. Fills as many
-// buffers as possible, the last buffers may contain silence only.
+// Returns the number of buffers containing sound. Fills as many buffers as
+// possible, the last buffers may contain silence only.
//-----------------------------------------------------------------------------
int tSampleSet::PrepareListen(tSample *spl, long fr_smpl, long to_smpl)
{
@@ -684,9 +685,6 @@
};
#endif
-// -----------------------------------------------------------------
-// ------------------------ global settings ------------------------
-// -----------------------------------------------------------------
#ifdef OBSOLETE
class tAudioGloblForm : public wxForm
@@ -694,7 +692,7 @@
public:
tAudioGloblForm(tSampleSet &s)
: wxForm( USED_WXFORM_BUTTONS ),
- set(s)
+ mSampleSet(s)
{
ossbug1 = gpConfig->GetValue(C_OssBug1);
@@ -709,7 +707,7 @@
"44100",
0
};
- speed = set.GetSpeed();
+ speed = mSampleSet.GetSamplingRate();
speedstr = 0;
for (int i = 0; speedtxt[i]; i++)
{
@@ -725,8 +723,8 @@
}
enable = gpMidiPlayer->GetAudioEnabled();
- stereo = (set.GetChannels() == 2);
- softsync = set.GetSoftSync();
+ stereo = (mSampleSet.GetChannelCount() == 2);
+ softsync = mSampleSet.GetSoftSync();
Add(wxMakeFormBool("Enable Audio", &enable));
Add(wxMakeFormNewLine());
@@ -756,14 +754,14 @@
void OnOk()
{
- if (set.is_playing)
+ if (mSampleSet.is_playing)
return;
wxBeginBusyCursor();
- set.mpGlobalSettingsDialog = 0;
+ mSampleSet.mpGlobalSettingsDialog = 0;
speed = atol(speedstr);
- set.SetSpeed(speed);
- set.SetChannels(stereo ? 2 : 1);
- set.SetSoftSync(softsync);
+ mSampleSet.SetSamplingRate(speed);
+ mSampleSet.SetChannelCount(stereo ? 2 : 1);
+ mSampleSet.SetSoftSync(softsync);
gpMidiPlayer->SetAudioEnabled(enable);
if (gpConfig->GetValue(C_EnableAudio) != enable)
@@ -791,17 +789,17 @@
}
if (enable)
- set.ReloadSamples();
+ mSampleSet.ReloadSamples();
wxEndBusyCursor();
wxForm::OnOk();
}
void OnCancel()
{
- set.mpGlobalSettingsDialog = 0;
+ mSampleSet.mpGlobalSettingsDialog = 0;
wxForm::OnCancel();
}
private:
- tSampleSet &set;
+ tSampleSet& mSampleSet;
wxList strlist;
long speed;
@@ -826,16 +824,8 @@
return;
}
- if (mpGlobalSettingsDialog == 0)
- {
- mpGlobalSettingsDialog = new wxDialog(pParent, wxID_ANY, "Audio Settings");
-#ifdef OBSOLETE
- tAudioGloblForm *form = new tAudioGloblForm(*this);
- form->AssociatePanel(mpGlobalSettingsDialog);
- mpGlobalSettingsDialog->Fit();
-#endif // OBSOLETE
- }
- mpGlobalSettingsDialog->Show(true);
+ JZAudioSettingsDialog AudioSettingsDialog(pParent, *this);
+ AudioSettingsDialog.ShowModal();
}
//-----------------------------------------------------------------------------
@@ -896,7 +886,7 @@
//-----------------------------------------------------------------------------
void tSampleSet::ClearSampleSet(wxWindow* pParent)
{
- if (mpSampleDialog == 0 && mpGlobalSettingsDialog == 0)
+ if (mpSampleDialog == 0)
{
if (wxMessageBox("Clear Sample Set?", "Confirm", wxYES_NO) == wxNO)
{
@@ -1031,11 +1021,11 @@
wh.sub_chunk = FMT;
wh.data_chunk = DATA;
wh.format = PCM_CODE;
- wh.modus = channels;
+ wh.modus = mChannelCount;
wh.sc_len = 16;
- wh.sample_fq = speed;
+ wh.sample_fq = mSamplingRate;
wh.bit_p_spl = bits;
- wh.byte_p_spl = channels * (bits > 8 ? 2 : 1);
+ wh.byte_p_spl = mChannelCount * (bits > 8 ? 2 : 1);
wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
@@ -1386,11 +1376,6 @@
//-----------------------------------------------------------------------------
void tSampleSet::SamplesDlg()
{
- if (mpGlobalSettingsDialog)
- {
- mpGlobalSettingsDialog->Show(true);
- return;
- }
if (mpSampleDialog == 0)
{
mpSampleDialog = new JZSamplesDialog(gpTrackWindow, *this);
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Audio.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -29,29 +29,30 @@
#include <wx/app.h>
#include <wx/string.h>
-class tEventArray;
+class JZSamplesDialog;
class JZTrack;
-struct tAudioBuffer;
class tAudioBufferQueue;
class tAudioRecordBuffer;
-class tSampleWin;
+class tEventArray;
class tSample;
class tSampleVoice;
+class tSampleWin;
+struct tAudioBuffer;
-// these should be variables and queried from the driver!
+// These should be variables and queried from the driver!
//
-// there is still a bug somewhere:
+// There is still a bug somewhere:
// FRAGBITS 13
// BUFCOUNT 64
-// midi-speed 114 (trackwin)
-// does not work, sounds like it skips a buffer after 18 bars
+// MIDI-speed 114 (trackwin)
+// Does not work, sounds like it skips a buffer after 18 bars.
//
// 1MB of buffer data seems to be reasonable.
#ifdef __WXMSW__
-// mswin has big buffers, good!
+// Microsoft Windows has big buffers.
#define FRAGBITS 14
#define FRAGBYTES (1 << FRAGBITS) // # bytes
@@ -62,8 +63,8 @@
#else
-// linux only has 64K buffers and wastes one fragment. So keep
-// fragments small
+// Linux only has 64K buffers and wastes one fragment, so keep the fragments
+// small.
#define FRAGBITS 13
#define FRAGBYTES (1 << FRAGBITS) // # bytes
@@ -72,17 +73,14 @@
#define BUFBYTES FRAGBYTES
#define BUFCOUNT 128 // # buffers
-#endif
+#define WAVEHDR char
-
-// =============================================================
-// AudioBuffers
-// =============================================================
-
-#ifndef __WXMSW__
-#define WAVEHDR char
#endif
+//*****************************************************************************
+// Description:
+// This is the audio buffer structure declaration.
+//*****************************************************************************
struct tAudioBuffer
{
// This is a Microsoft Windows for mswin wavehdr
@@ -118,7 +116,8 @@
DECLARE_ARRAY(tAudioBufferArray, tAudioBuffer*)
-
+//*****************************************************************************
+//*****************************************************************************
class tAudioBufferQueue
{
public:
@@ -177,8 +176,8 @@
int read, written;
};
-
-
+//*****************************************************************************
+//*****************************************************************************
class tAudioRecordBuffer
{
friend class tSampleSet;
@@ -215,13 +214,10 @@
};
-// =============================================================
-// tSampleSet
-// =============================================================
-
-class JZSamplesDialog;
-
//*****************************************************************************
+// Description:
+// This is the sample set class declaration. This class holds a collection
+// of audio samples that are played when a particular MIDI signal is received.
//*****************************************************************************
class tSampleSet
{
@@ -229,7 +225,6 @@
friend class tSampleVoice;
friend class tSample;
- friend class tAudioGloblForm;
friend class JZWindowsAudioPlayer;
friend class tAudioPlayer;
friend class tAlsaAudioPlayer;
@@ -256,26 +251,26 @@
void Edit(int key);
- int GetSpeed() const
+ int GetSamplingRate() const
{
- return speed;
+ return mSamplingRate;
}
- void SetSpeed(int x)
+ void SetSamplingRate(int SamplingRate)
{
- dirty |= (speed != x);
- speed = x;
+ dirty |= (mSamplingRate != SamplingRate);
+ mSamplingRate = SamplingRate;
}
- int GetChannels() const
+ int GetChannelCount() const
{
- return channels;
+ return mChannelCount;
}
- void SetChannels(int x)
+ void SetChannelCount(int ChannelCount)
{
- dirty |= (channels != x);
- channels = x;
+ dirty |= (mChannelCount != ChannelCount);
+ mChannelCount = ChannelCount;
}
int BitsPerSample() const
@@ -309,16 +304,18 @@
long Ticks2Samples(long ticks) const
{
- long spl =
- (long)(60.0 * ticks * speed * channels / (double)ticks_per_minute);
+ long spl = (long)(
+ 60.0 * ticks * mSamplingRate * mChannelCount /
+ (double)ticks_per_minute);
// Align to the first channel.
- return spl & -channels;
+ return spl & -mChannelCount;
}
double Samples2Ticks(long samples) const
{
- return (double)samples * ticks_per_minute / 60.0 / speed / channels;
+ return (double)
+ samples * ticks_per_minute / 60.0 / mSamplingRate / mChannelCount;
}
// time in millisec
@@ -334,12 +331,12 @@
long Samples2Time(long samples) const
{
- return (long)(1000.0 * samples / speed / channels);
+ return (long)(1000.0 * samples / mSamplingRate / mChannelCount);
}
long Time2Samples(long time) const
{
- return (long)(0.001 * time * speed * channels);
+ return (long)(0.001 * time * mSamplingRate * mChannelCount);
}
virtual const std::string& GetSampleLabel(int Index);
@@ -388,7 +385,7 @@
long SampleSize(long num_samples)
{
- return channels * (bits == 8 ? 1L : 2L) * num_samples;
+ return mChannelCount * (bits == 8 ? 1L : 2L) * num_samples;
}
long BufferClock(int i) const
@@ -400,15 +397,19 @@
protected:
- long speed; // samples / second
- int channels; // mono = 1, stereo = 2
+ // Sampling rate in samples per second or Hz.
+ int mSamplingRate;
+
+ // mono = 1, stereo = 2
+ int mChannelCount;
+
int bits; // must be 16!
bool softsync; // enable software midi/audio sync
tSample* mSamples[eSampleCount];
tSampleWin* mSampleWindows[eSampleCount];
- long ticks_per_minute; // midi speed for audio/midi sync
+ long ticks_per_minute; // MIDI sampling rate for audio/midi sync.
double clocks_per_buffer;
long start_clock; // when did play start
@@ -424,7 +425,6 @@
// return the start clock for i-th free buffer
long buffers_written; // for computing buffers clock
- wxDialog* mpGlobalSettingsDialog;
JZSamplesDialog* mpSampleDialog;
tEventArray* events;
Added: trunk/jazz/src/Dialogs/AudioSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/AudioSettingsDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/AudioSettingsDialog.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -0,0 +1,89 @@
+#include "AudioSettingsDialog.h"
+
+#include "../Audio.h"
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZAudioSettingsDialog::JZAudioSettingsDialog(
+ wxWindow* pParent,
+ tSampleSet& SampleSet)
+ : wxDialog(pParent, wxID_ANY, wxString("Audio Settings")),
+ mSampleSet(SampleSet),
+ mpEnableAudioCheckBox(0),
+ mpSamplingRateComboBox(0),
+ mpStereoCheckBox(0),
+ mpSoftwareMidiAudioSyncCheckBox(0)
+{
+ mpEnableAudioCheckBox = new wxCheckBox(this, wxID_ANY, "Enable Audio");
+
+ wxArrayString SampleRates;
+ SampleRates.push_back("8000");
+ SampleRates.push_back("11025");
+ SampleRates.push_back("22050");
+ SampleRates.push_back("44100");
+
+ mpSamplingRateComboBox = new wxComboBox(
+ this,
+ wxID_ANY,
+ "",
+ wxDefaultPosition,
+ wxDefaultSize,
+ SampleRates);
+
+ mpStereoCheckBox = new wxCheckBox(this, wxID_ANY, "Stereo");
+
+ mpSoftwareMidiAudioSyncCheckBox = new wxCheckBox(
+ this,
+ wxID_ANY,
+ "Software MIDI/Audio Sync");
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+ wxFlexGridSizer* pFlexGridSizer;
+
+ pTopSizer->Add(mpEnableAudioCheckBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 2, 4, 2);
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Sample Rate"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpSamplingRateComboBox,
+ 0,
+ wxALIGN_CENTER_VERTICAL);
+ pTopSizer->Add(pFlexGridSizer, 0, wxALIGN_CENTER | wxALL, 3);
+
+ pTopSizer->Add(mpStereoCheckBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ pTopSizer->Add(
+ mpSoftwareMidiAudioSyncCheckBox,
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 3);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
Property changes on: trunk/jazz/src/Dialogs/AudioSettingsDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/AudioSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/AudioSettingsDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/AudioSettingsDialog.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -0,0 +1,48 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2010 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_AUDIOSETTINGSDIALOG_H
+#define JZ_AUDIOSETTINGSDIALOG_H
+
+#include <wx/dialog.h>
+
+class tSampleSet;
+class wxCheckBox;
+class wxComboBox;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZAudioSettingsDialog : public wxDialog
+{
+ public:
+
+ JZAudioSettingsDialog(wxWindow* pParent, tSampleSet& SampleSet);
+
+ private:
+
+ tSampleSet& mSampleSet;
+
+ wxCheckBox* mpEnableAudioCheckBox;
+ wxComboBox* mpSamplingRateComboBox;
+ wxCheckBox* mpStereoCheckBox;
+ wxCheckBox* mpSoftwareMidiAudioSyncCheckBox;
+};
+
+#endif // !defined(JZ_AUDIOSETTINGSDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/AudioSettingsDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Makefile.am 2010-07-12 01:21:59 UTC (rev 790)
@@ -22,6 +22,7 @@
DeprecatedWx/prop.cpp \
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
+Dialogs/AudioSettingsDialog.cpp \
Dialogs/CleanupDialog.cpp \
Dialogs/ControllerDialog.cpp \
Dialogs/DeleteDialog.cpp \
@@ -119,6 +120,7 @@
DeprecatedWx/prop.cpp \
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
+Dialogs/AudioSettingsDialog.cpp \
Dialogs/CleanupDialog.cpp \
Dialogs/ControllerDialog.cpp \
Dialogs/DeleteDialog.cpp \
@@ -221,6 +223,7 @@
DeprecatedWx/propform.h \
DeprecatedWx/proplist.h \
DeprecatedStringUtils.h \
+Dialogs/AudioSettingsDialog.h \
Dialogs/CleanupDialog.h \
Dialogs/ControllerDialog.h \
Dialogs/DeleteDialog.h \
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Player.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -243,13 +243,16 @@
virtual void StartAudio()
{
}
- virtual int GetAudioEnabled() const
+
+ virtual bool GetAudioEnabled() const
{
- return 0;
+ return false;
}
- virtual void SetAudioEnabled(int)
+
+ virtual void SetAudioEnabled(bool AudioEnabled)
{
}
+
virtual void ListenAudio(int key, int start_stop_mode = 1)
{
}
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Sample.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -309,7 +309,7 @@
}
// convert mono -> stereo
- if (channels == 1 && set.channels == 2)
+ if (channels == 1 && set.GetChannelCount() == 2)
{
short *old = data;
length = length * 2;
@@ -325,7 +325,7 @@
channels = 2;
}
// convert stereo -> mono
- else if (channels == 2 && set.channels == 1)
+ else if (channels == 2 && set.GetChannelCount() == 1)
{
short *old = data;
length = length / 2;
@@ -345,9 +345,9 @@
// convert sampling speed
if (pitch != 0)
speed = (int)(speed * pow(FSEMI, pitch));
- if (speed != set.speed)
+ if (speed != set.GetSamplingRate())
{
- float f = (float)speed / (float)set.speed;
+ float f = (float)speed / (float)set.GetSamplingRate();
Transpose(f);
}
@@ -356,7 +356,7 @@
{
int ch1 = volume;
int ch2 = volume;
- int ppan = (set.channels == 2) ? pan : 0;
+ int ppan = (set.GetChannelCount() == 2) ? pan : 0;
if (ppan > 0)
ch1 = (int)volume * (63L - ppan) / 64L;
else if (ppan < 0)
@@ -426,7 +426,7 @@
offs = 0;
else if (offs > length)
offs = length;
- return offs & -(int)set.channels;
+ return offs & - set.GetChannelCount();
}
@@ -528,7 +528,7 @@
void tSample::Flip(int ch)
{
int i = ch;
- int step = set.GetChannels();
+ int step = set.GetChannelCount();
while (i < length)
{
data[i] = -data[i];
@@ -553,13 +553,13 @@
int tSample::GetSamplingRate() const
{
- return set.GetSpeed();
+ return set.GetSamplingRate();
}
-int tSample::GetChannels() const
+int tSample::GetChannelCount() const
{
- return set.GetChannels();
+ return set.GetChannelCount();
}
@@ -603,7 +603,7 @@
void tSample::Transpose(float f)
{
- int channels = set.GetChannels();
+ int channels = set.GetChannelCount();
int new_length = ((int)((double)length / (double)f) & (-channels));
short *new_data = new short [new_length];
@@ -629,13 +629,23 @@
int tSample::Seconds2Samples(float time)
{
- JZMapper Map(0.0, 1.0, 0.0, (double)set.speed * set.channels);
+ JZMapper Map(
+ 0.0,
+ 1.0,
+ 0.0,
+ (double)set.GetSamplingRate() * set.GetChannelCount());
+
return static_cast<int>(Map.XToY(time));
}
float tSample::Samples2Seconds(int samples)
{
- JZMapper Map(0.0, (double)set.speed * set.channels, 0.0, 1.0);
+ JZMapper Map(
+ 0.0,
+ (double)set.GetSamplingRate() * set.GetChannelCount(),
+ 0.0,
+ 1.0);
+
return (float)Map.XToY(samples);
}
@@ -683,19 +693,19 @@
int tSample::SaveWave()
{
WaveHeader wh;
- wh.main_chunk = RIFF;
- wh.chunk_type = WAVE;
- wh.sub_chunk = FMT;
- wh.data_chunk = DATA;
- wh.format = PCM_CODE;
- wh.modus = set.channels;
- wh.sc_len = 16;
- wh.sample_fq = set.speed;
- wh.bit_p_spl = set.bits;
- wh.byte_p_spl = set.channels * (set.bits > 8 ? 2 : 1);
- wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
- wh.data_length = length * sizeof(short);
- wh.length = wh.data_length + sizeof(WaveHeader);
+ wh.main_chunk = RIFF;
+ wh.chunk_type = WAVE;
+ wh.sub_chunk = FMT;
+ wh.data_chunk = DATA;
+ wh.format = PCM_CODE;
+ wh.modus = set.GetChannelCount();
+ wh.sc_len = 16;
+ wh.sample_fq = set.GetSamplingRate();
+ wh.bit_p_spl = set.bits;
+ wh.byte_p_spl = set.GetChannelCount() * (set.bits > 8 ? 2 : 1);
+ wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
+ wh.data_length = length * sizeof(short);
+ wh.length = wh.data_length + sizeof(WaveHeader);
#ifdef __WXMSW__
unlink(mFileName.c_str()); // buggy, sigh!
@@ -719,8 +729,8 @@
data = new float [length];
for (int i = 0; i < length; i++)
data[i] = (float)spl.data[i];
- channels = spl->GetChannels();
- sampling_rate = spl->GetSpeed();
+ channels = spl->GetChannelCount();
+ sampling_rate = spl->GetSamplingRate();
}
tFloatSample::tFloatSample(tSample &spl, int fr, int to)
@@ -730,8 +740,8 @@
data = new float [length];
for (int i = 0; i < length; i++)
data[i] = (float)spl.data[i + fr];
- channels = spl->GetChannels();
- sampling_rate = spl->GetSpeed();
+ channels = spl->GetChannelCount();
+ sampling_rate = spl->GetSamplingRate();
}
tFloatSample::tFloatSample(int ch, int sr)
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Sample.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -153,7 +153,7 @@
void AssureLength(int new_length);
- int GetChannels() const
+ int GetChannelCount() const
{
return channels;
}
@@ -195,9 +195,9 @@
* data[n+1] == 2nd value for left channel
* ...
* all length values mean number of shorts and
- * should be multiples of of set.GetChannels().
+ * should be multiples of of set.GetChannelCount().
* Offsets should start on channel boundaries,
- * that is offs % set.GetChannels() == 0.
+ * that is offs % set.GetChannelCount() == 0.
*/
class tSample
@@ -315,7 +315,8 @@
return &set;
}
- int GetChannels() const;
+ int GetChannelCount() const;
+
int GetSamplingRate() const;
/**
Modified: trunk/jazz/src/SampleCommand.cpp
===================================================================
--- trunk/jazz/src/SampleCommand.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/SampleCommand.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@
if (n <= 0)
return; // no data
- long channels = spl.GetChannels();
+ long channels = spl.GetChannelCount();
float N = spl.length / channels - 2;
short *data = spl.data;
@@ -238,7 +238,7 @@
void tWahWah::Execute(long fr, long to)
{
tFloatSample *out = new tFloatSample(spl);
- for (int c = 0; c < out->GetChannels(); c++)
+ for (int c = 0; c < out->GetChannelCount(); c++)
Wah(c, *out);
out->Rescale();
spl.Set(*out);
@@ -251,7 +251,7 @@
{
long N = spl.GetLength();
float SR = spl.GetSamplingRate();
- long channels = spl.GetChannels();
+ long channels = spl.GetChannelCount();
JZMapper XMap(0, N, 0, arr.Size());
JZMapper fmap(0, 100, lo_freq, hi_freq);
@@ -297,7 +297,7 @@
{
JZMapper wmap(0, 100, 0.05, 0.3);
tFloatSample inp(spl);
- tFloatSample out(inp.GetChannels(), inp.GetSamplingRate());
+ tFloatSample out(inp.GetChannelCount(), inp.GetSamplingRate());
float p[8];
p[0] = 0;
p[1] = 0;
@@ -308,7 +308,7 @@
p[6] = 0;
p[7] = 0;
rotate(p, 8, inp, out);
- if (inp.GetChannels() == 2)
+ if (inp.GetChannelCount() == 2)
{
p[6] = 1;
p[7] = 1;
@@ -337,7 +337,7 @@
{
JZMapper wmap(0, 100, 0.05, 0.3);
tFloatSample inp(spl);
- tFloatSample out(inp.GetChannels(), inp.GetSamplingRate());
+ tFloatSample out(inp.GetChannelCount(), inp.GetSamplingRate());
float p[8];
p[0] = 0;
p[1] = 0;
@@ -348,7 +348,7 @@
p[6] = 0;
p[7] = 0;
rotate(p, 8, inp, out);
- if (inp.GetChannels() == 2)
+ if (inp.GetChannelCount() == 2)
{
p[6] = 1;
p[7] = 1;
@@ -403,7 +403,7 @@
reinit = (int)(p[5] * SR);
off = reinit/2;
k = off;
- chans = sout.GetChannels();
+ chans = sout.GetChannelCount();
inchan = (int)p[6];
j = 0;
for (i = 0; i < nsamps; i++)
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/SampleDialog.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@
spl(w.GetSample())
{
int i;
- channels = spl.GetChannels();
+ channels = spl.GetChannelCount();
for (i = 0; i < array.Size(); ++i)
{
array[i] = 0;
@@ -172,7 +172,7 @@
float oldpeak = fs.Peak();
int i = 0;
- int channels = fs.GetChannels();
+ int channels = fs.GetChannelCount();
int n = to - fr;
float *data = fs.GetData();
@@ -991,7 +991,7 @@
float peak = fs.Peak();
if (rand)
{
- if (fs.GetChannels() == 2)
+ if (fs.GetChannelCount() == 2)
fs.RndEchoStereo(num_echos, dmap(delay), (float)amap(ampl));
else
fs.RndEcho(num_echos, dmap(delay), (float)amap(ampl));
@@ -1073,7 +1073,7 @@
{
JZMapper wmap(0, 100, 0.05, 0.3);
tFloatSample inp(spl);
- tFloatSample out(inp.GetChannels(), inp.GetSamplingRate());
+ tFloatSample out(inp.GetChannelCount(), inp.GetSamplingRate());
//float peak = inp.Peak();
tShifterCmd shifter(inp, out);
@@ -1088,7 +1088,7 @@
p[6] = 0;
p[7] = 0;
shifter.rotate(p, 8);
- if (inp.GetChannels() == 2)
+ if (inp.GetChannelCount() == 2)
{
p[6] = 1;
p[7] = 1;
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/SampleWindow.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -317,7 +317,7 @@
{
int cw, ch;
GetClientSize(&cw, &ch);
-// snapsel.SetYSnap(0, ch, ch / spl.GetChannels());
+// snapsel.SetYSnap(0, ch, ch / spl.GetChannelCount());
snapsel.SetYSnap(0, ch, ch);
AdjustScrollbars();
@@ -467,7 +467,7 @@
int cw, ch;
GetClientSize(&cw, &ch);
- int n = spl.GetChannels();
+ int n = spl.GetChannelCount();
for (int i = 0; i < n; ++i)
{
int x = 0;
@@ -579,7 +579,7 @@
{
const short* data = spl.GetData();
int length = spl.GetLength();
- int step = spl.GetChannels();
+ int step = spl.GetChannelCount();
// compute display range from position scrollbar
int xfr = paint_offset + channel;
@@ -887,15 +887,15 @@
int yy = ToolBarSize.GetHeight();
int ww = cw;
int hh = ch - ToolBarSize.GetHeight() - zh - ph;
- int nn = spl.GetChannels() + num_params;
+ int nn = spl.GetChannelCount() + num_params;
- int hi = hh * spl.GetChannels() / nn;
+ int hi = hh * spl.GetChannelCount() / nn;
cnvs->SetSize(xx, yy, ww, hi);
hi = hh / nn;
for (int i = 0; i < num_params; i++)
{
- int yi = yy + (i + spl.GetChannels()) * hh / nn;
+ int yi = yy + (i + spl.GetChannelCount()) * hh / nn;
params[i]->SetSize(xx, yi, ww, hi);
}
}
Modified: trunk/jazz/src/Signal2.cpp
===================================================================
--- trunk/jazz/src/Signal2.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Signal2.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -77,7 +77,7 @@
float room_val) // echo delay
{
long sr = spl.GetSamplingRate();
- long ch = spl.GetChannels();
+ long ch = spl.GetChannelCount();
tSigSynth synth(sr, ch);
tShortIter isig(synth, spl);
@@ -115,7 +115,7 @@
float volume) // 0..1
{
long sr = spl.GetSamplingRate();
- long ch = spl.GetChannels();
+ long ch = spl.GetChannelCount();
tSigSynth synth(sr, ch);
tShortIter isig(synth, spl);
@@ -200,7 +200,7 @@
)
{
long sr = spl.GetSamplingRate();
- long ch = spl.GetChannels();
+ long ch = spl.GetChannelCount();
tSigSynth synth(sr, ch);
FreqTab ft;
double freq = ft.freq(midi_key);
Modified: trunk/jazz/src/Signal2.h
===================================================================
--- trunk/jazz/src/Signal2.h 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/Signal2.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -314,7 +314,7 @@
generators.push_back(&gen);
}
- int GetChannels() const
+ int GetChannelCount() const
{
return channels;
}
@@ -349,7 +349,7 @@
tSigInput(tSigSynth &parent) : synth(parent)
{
synth.AddGenerator(*this);
- channels = synth.GetChannels();
+ channels = synth.GetChannelCount();
sampling_rate = synth.GetSamplingRate();
current = -1;
}
@@ -506,8 +506,8 @@
{
Resize(this->GetLength() * 2);
}
- long idata = this->GetCurrent() * this->GetChannels();
- for (int i = 0; i < this->GetChannels(); i++)
+ long idata = this->GetCurrent() * this->GetChannelCount();
+ for (int i = 0; i < this->GetChannelCount(); i++)
{
this->data[idata++] = (T)v[i];
}
@@ -599,7 +599,7 @@
public:
tSigWaveOscil(tSigSynth &synth, int N, double f, double ffact = FSEMI)
: tSignalModifier(synth),
- array(N, synth.GetChannels()),
+ array(N, synth.GetChannelCount()),
freq(f),
SR(synth.GetSamplingRate()),
frqfact(ffact)
@@ -659,7 +659,7 @@
public:
tSigWaveCtrl(tSigSynth &synth, int N, double durat)
: tSigInput(synth),
- array(N, synth.GetChannels()),
+ array(N, synth.GetChannelCount()),
xmap(0, synth.GetSamplingRate() * durat, 0, N)
{
}
@@ -806,7 +806,7 @@
tSigDelay(tSigSynth &synth, float time)
: tSignalModifier(synth),
size((long)(time * sampling_rate) + 2),
- array(size, synth.GetChannels())
+ array(size, synth.GetChannelCount())
{
map.Initialize(-1, 1, 0, -size+1);
}
@@ -1045,7 +1045,7 @@
tSigComb(tSigSynth &synth, float loop_time, float reverb_time)
: tSignalModifier(synth),
size((long)(loop_time * synth.GetSamplingRate())),
- array(size+2, synth.GetChannels())
+ array(size+2, synth.GetChannelCount())
{
coeff = exp((double)(log001 * loop_time / reverb_time));
}
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
// Indicate that we are not recording!
mpPlayer->mpRecordingInfo = 0;
- mChannels = mpPlayer->mSamples.GetChannels();
+ mChannels = mpPlayer->mSamples.GetChannelCount();
mCount = mpPlayer->mSamples.PrepareListen(key);
@@ -90,7 +90,7 @@
// Indicate that we are not recording!
mpPlayer->mpRecordingInfo = 0;
- mChannels = mpPlayer->mSamples.GetChannels();
+ mChannels = mpPlayer->mSamples.GetChannelCount();
mCount = mpPlayer->mSamples.PrepareListen(&spl, fr_smpl, to_smpl);
@@ -150,17 +150,20 @@
mErrorCode(NoError),
mCanDuplex(false),
mCanSynchronize(true),
+ mInstalled(false),
+ mAudioEnabled(false),
+ blocks_played(0),
+ play_buffers_needed(0),
+ start_clock(0),
+ start_time(0),
mpListener(0)
{
mpState->audio_player = this;
InitializeCriticalSection(&mutex);
- long dummy = 0;
mpAudioBuffer = new tEventArray();
- mInstalled = false;
- dummy = gpConfig->GetValue(C_EnableAudio);
- audio_enabled = dummy;
+ mAudioEnabled = (gpConfig->GetValue(C_EnableAudio) != 0);
hout_open = 0;
hinp_open = 0;
@@ -193,7 +196,7 @@
}
}
recbuffers.Clear();
- audio_enabled = (audio_enabled && mInstalled);
+ mAudioEnabled = (mAudioEnabled && mInstalled);
}
//-----------------------------------------------------------------------------
@@ -264,7 +267,7 @@
mErrorCode = NoError; // everything ok for now.
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return 0;
}
@@ -275,9 +278,9 @@
WAVEFORMATEX fmt;
memset(&fmt, 0, sizeof(fmt));
fmt.wFormatTag = WAVE_FORMAT_PCM;
- fmt.nChannels = mSamples.GetChannels();
- fmt.nSamplesPerSec = mSamples.GetSpeed();
- fmt.nBlockAlign = mSamples.GetChannels() * sizeof(short);
+ fmt.nChannels = mSamples.GetChannelCount();
+ fmt.nSamplesPerSec = mSamples.GetSamplingRate();
+ fmt.nBlockAlign = mSamples.GetChannelCount() * sizeof(short);
fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec;
fmt.wBitsPerSample = 16;
fmt.cbSize = 0;
@@ -490,7 +493,7 @@
//-----------------------------------------------------------------------------
void JZWindowsAudioPlayer::WriteBuffers()
{
- if (audio_enabled && hout_open)
+ if (mAudioEnabled && hout_open)
{
tAudioBuffer* pAudioBuffer;
while ((pAudioBuffer = mSamples.full_buffers.Get()) != 0)
@@ -517,7 +520,7 @@
//-----------------------------------------------------------------------------
void JZWindowsAudioPlayer::Notify()
{
- if (audio_enabled)
+ if (mAudioEnabled)
{
EnterCriticalSection(&mutex);
@@ -539,8 +542,9 @@
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
long time_now = (long)timeGetTime();
- long audio_now =
- (long)((double)start_time + 1000.0 * mmtime.u.sample / mSamples.speed);
+ long audio_now = (long)(
+ (double)start_time + 1000.0 * mmtime.u.sample /
+ mSamples.GetSamplingRate());
// low pass filter for time-correction (not really necessary)
const long low = 50;
@@ -588,9 +592,11 @@
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
long time_now = (long)timeGetTime();
- long audio_now =
- (long)((double)mpState->start_time + 1000.0 * mmtime.u.sample / mSamples.speed);
- // low pass filter for time-correction (not really necessary)
+ long audio_now = (long)(
+ (double)mpState->start_time + 1000.0 * mmtime.u.sample /
+ mSamples.GetSamplingRate());
+
+ // Low pass filter for time-correction (not really necessary).
const long low = 50;
mpState->time_correction = (low * mpState->time_correction + (100 - low) * (audio_now - time_now) ) / 100L;
}
@@ -598,7 +604,7 @@
}
LeaveCriticalSection(&mutex);
- } // if (audio_enabled)
+ } // if (mAudioEnabled)
JZWindowsIntPlayer::Notify();
}
@@ -610,7 +616,7 @@
mSamples.StartPlay(Clock);
JZWindowsIntPlayer::StartPlay(Clock, LoopClock, Continue);
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -655,7 +661,7 @@
//-----------------------------------------------------------------------------
void JZWindowsAudioPlayer::ListenAudio(int key, int start_stop_mode)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
@@ -684,9 +690,12 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsAudioPlayer::ListenAudio(tSample &spl, long fr_smpl, long to_smpl)
+void JZWindowsAudioPlayer::ListenAudio(
+ tSample &spl,
+ long fr_smpl,
+ long to_smpl)
{
- if (!audio_enabled)
+ if (!mAudioEnabled)
{
return;
}
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.h 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.h 2010-07-12 01:21:59 UTC (rev 790)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -71,14 +71,14 @@
return mInstalled && JZWindowsIntPlayer::IsInstalled();
}
- virtual int GetAudioEnabled() const
+ virtual bool GetAudioEnabled() const
{
- return audio_enabled;
+ return mAudioEnabled;
}
- virtual void SetAudioEnabled(int x)
+ virtual void SetAudioEnabled(bool AudioEnabled)
{
- audio_enabled = x;
+ mAudioEnabled = AudioEnabled;
}
virtual void ListenAudio(int key, int start_stop_mode = 1);
@@ -123,6 +123,11 @@
void AudioCallback(UINT msg);
+ int OpenDsp(); // 0 = ok
+ int CloseDsp(); // 0 = ok
+
+ private:
+
TEErrorCode mErrorCode;
// Indicates if full duplex record/play is possible.
@@ -131,11 +136,11 @@
// Indicates if the exact output play position can be determined.
bool mCanSynchronize;
- int OpenDsp(); // 0 = ok
- int CloseDsp(); // 0 = ok
+ bool mInstalled;
- bool mInstalled;
- int audio_enabled; // 0 means midi only
+ // A value of false means MIDI only.
+ bool mAudioEnabled;
+
long blocks_played; // # of blocks written to device
int play_buffers_needed; // driver requests more output buffers
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-07-11 21:45:22 UTC (rev 789)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-07-12 01:21:59 UTC (rev 790)
@@ -1129,6 +1129,14 @@
Name="Dialog Source Files"
>
<File
+ RelativePath="..\src\Dialogs\AudioSettingsDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\AudioSettingsDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\CleanupDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-11 21:45:32
|
Revision: 789
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=789&view=rev
Author: pstieber
Date: 2010-07-11 21:45:22 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
1. Changed GetFilename and SetFilename to GetFileName and SetFileName in tSample.
2. Changed the char* filename data member of tSample to std::string mFileName.
3. Changed the file name argument in tSampleSet::AddNote to std::string.
4. Changed TRUE to true and FALSE to false in SampleWindow.cpp.
5. Changed fname to FileName.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Sample.cpp
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleWindow.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-07-11 21:19:45 UTC (rev 788)
+++ trunk/jazz/src/Audio.cpp 2010-07-11 21:45:22 UTC (rev 789)
@@ -321,7 +321,7 @@
continue;
}
assert(0 <= key && key < eSampleCount);
- mSamples[key]->SetFilename(SplFilePath.c_str());
+ mSamples[key]->SetFileName(SplFilePath.c_str());
mSamples[key]->SetLabel(Label.c_str());
mSamples[key]->SetVolume(vol);
mSamples[key]->SetPan(pan);
@@ -331,7 +331,7 @@
wxString String;
String
<< "Could not load: \""
- << mSamples[key]->GetFilename()
+ << mSamples[key]->GetFileName()
<< '"';
::wxMessageBox(String, "Error", wxOK);
}
@@ -365,14 +365,14 @@
for (int i = 0; i < eSampleCount; i++)
{
tSample* pSample = mSamples[i];
- const char* fname = pSample->GetFilename();
+ const string& FileName = pSample->GetFileName();
int vol = pSample->GetVolume();
int pan = pSample->GetPan();
int pitch = pSample->GetPitch();
- if (fname[0])
+ if (!FileName.empty())
{
Ofs << i << ' ';
- WriteString(Ofs, fname);
+ WriteString(Ofs, FileName);
Ofs << ' ';
WriteString(Ofs, pSample->GetLabel());
Ofs << ' ' << pan << ' ' << vol << ' ' << pitch << endl;
@@ -850,15 +850,15 @@
//-----------------------------------------------------------------------------
void tSampleSet::LoadSampleSet(wxWindow* pParent)
{
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Load Sample Set",
false,
has_changed,
"*.spl");
- if (fname)
+ if (FileName)
{
- Load(fname);
+ Load(FileName);
}
}
@@ -867,15 +867,15 @@
//-----------------------------------------------------------------------------
void tSampleSet::SaveSampleSetAs(wxWindow* pParent)
{
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Save Sample Set",
true,
has_changed,
"*.spl");
- if (fname)
+ if (FileName)
{
- Save(fname);
+ Save(FileName);
}
}
@@ -948,17 +948,19 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void tSampleSet::AddNote(const char *fname, long frc, long toc)
+void tSampleSet::AddNote(const string& FileName, long frc, long toc)
{
int i;
tSample *spl;
- // see if fname is already present in sample list
+ // See if the file name is already present in sample list.
for (i = 0; i < eSampleCount; i++)
{
spl = mSamples[i];
- if (strcmp(spl->GetFilename(), fname) == 0)
+ if (spl->GetFileName() == FileName)
+ {
break;
+ }
}
// if no entry is there, add an entry
@@ -968,8 +970,10 @@
for (i = 15; i < eSampleCount; i++)
{
spl = mSamples[i];
- if (spl->GetFilename()[0] == 0)
+ if (spl->GetFileName()[0] == 0)
+ {
break;
+ }
}
}
@@ -978,8 +982,8 @@
int key = i;
spl->Clear(); // reset everything to defaults
- spl->SetFilename(fname);
- spl->SetLabel(wxFileNameFromPath((char *)fname));
+ spl->SetFileName(FileName);
+ spl->SetLabel(wxFileNameFromPath(FileName));
spl->Load(); // reload data
// delete selection
@@ -1203,7 +1207,7 @@
mpPanSlider->SetValue(spl->GetPan());
#ifdef OBSOLETE
pLabel->SetValue((char *)spl->GetLabel());
- file->SetValue((char *)spl->GetFilename());
+ file->SetValue((char *)spl->GetFileName());
#endif
}
@@ -1217,7 +1221,7 @@
spl->SetPan(mpPanSlider->GetValue());
#ifdef OBSOLETE
spl->SetLabel(pLabel->GetValue());
- spl->SetFilename(file->GetValue());
+ spl->SetFileName(file->GetValue());
#endif
}
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2010-07-11 21:19:45 UTC (rev 788)
+++ trunk/jazz/src/Audio.h 2010-07-11 21:45:22 UTC (rev 789)
@@ -363,7 +363,7 @@
long toc,
tAudioRecordBuffer &buf);
- void AddNote(const char *fname, long frc, long toc);
+ void AddNote(const std::string& FileName, long frc, long toc);
void RefreshDialogs();
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2010-07-11 21:19:45 UTC (rev 788)
+++ trunk/jazz/src/Sample.cpp 2010-07-11 21:45:22 UTC (rev 789)
@@ -40,13 +40,13 @@
tSample::tSample(tSampleSet &s)
: set(s),
- mLabel()
+ mLabel(),
+ mFileName()
{
data = 0;
length = 0;
external_flag = 1; // auto reload when file changes on disk
external_time = 0;
- filename = copystring("");
volume = 127;
pan = 0;
pitch = 0;
@@ -57,7 +57,6 @@
tSample::~tSample()
{
delete [] data;
- delete [] filename;
}
void tSample::SetLabel(const std::string& Label)
@@ -65,25 +64,21 @@
mLabel = Label;
}
-void tSample::SetFilename(const char *fname)
+void tSample::SetFileName(const string& FileName)
{
- if (strcmp(filename, fname) != 0)
+ if (mFileName != FileName)
{
dirty = 1;
- char *s = copystring(fname);
- mLabel = wxFileNameFromPath(s);
- delete [] s;
+ mLabel = wxFileNameFromPath(FileName.c_str());
}
- delete [] filename;
- filename = copystring(fname);
+ mFileName = FileName;
}
void tSample::Clear()
{
FreeData();
mLabel.clear();
- delete [] filename;
- filename = copystring("");
+ mFileName.clear();
volume = 127;
pan = 0;
pitch = 0;
@@ -171,15 +166,15 @@
int tSample::LoadWav()
{
struct stat buf;
- if (stat(filename, &buf) == -1)
+ if (stat(mFileName.c_str(), &buf) == -1)
{
- perror(filename);
+ perror(mFileName.c_str());
return 1;
}
external_time = buf.st_mtime;
// read and check header info
- ifstream is(filename, ios::binary | ios::in);
+ ifstream is(mFileName.c_str(), ios::binary | ios::in);
WaveHeader wh;
memset(&wh, 0, sizeof(wh));
is.read((char *)&wh, sizeof(wh));
@@ -188,12 +183,12 @@
|| wh.sub_chunk != FMT
|| wh.data_chunk != DATA)
{
- //fprintf(stderr, "%s format not recognized\n", filename);
+ //fprintf(stderr, "%s format not recognized\n", mFileName.c_str());
return 2;
}
if (wh.format != PCM_CODE)
{
- //fprintf(stderr, "%s must be PCM_CODE\n", filename);
+ //fprintf(stderr, "%s must be PCM_CODE\n", mFileName.c_str());
return 3;
}
@@ -230,9 +225,9 @@
int tSample::LoadWav()
{
struct stat buf;
- if (stat(filename, &buf) == -1)
+ if (stat(mFileName.c_str(), &buf) == -1)
{
- perror(filename);
+ perror(mFileName.c_str());
return 1;
}
external_time = buf.st_mtime;
@@ -240,7 +235,7 @@
ChunkHeader ch;
// read and check header info
- ifstream is(filename, ios::binary | ios::in);
+ ifstream is(mFileName.c_str(), ios::binary | ios::in);
RIFFHeader rh;
is.read((char *)&rh, sizeof(rh));
if (strncmp(rh.main_type, "RIFF", 4) || strncmp(rh.sub_type, "WAVE", 4))
@@ -381,15 +376,15 @@
{
// determine file size
struct stat buf;
- if (stat(filename, &buf) == -1)
+ if (stat(mFileName.c_str(), &buf) == -1)
{
- perror(filename);
+ perror(mFileName.c_str());
return 1;
}
length = buf.st_size/2;
external_time = buf.st_mtime;
- ifstream is(filename, ios::binary | ios::in);
+ ifstream is(mFileName.c_str(), ios::binary | ios::in);
data = new short [length];
is.read((char *)data, length * 2);
return 0;
@@ -399,12 +394,12 @@
int tSample::Load(int force)
{
// sample modified on disk?
- if (filename && filename[0] && !force && !dirty && external_flag)
+ if (!mFileName.empty() && !force && !dirty && external_flag)
{
struct stat buf;
- if (stat(filename, &buf) == -1)
+ if (stat(mFileName.c_str(), &buf) == -1)
{
- perror(filename);
+ perror(mFileName.c_str());
return 1;
}
if (external_time != buf.st_mtime)
@@ -414,7 +409,7 @@
if (force || dirty)
{
FreeData();
- if (filename && filename[0])
+ if (!mFileName.empty())
{
int rc = LoadWav();
dirty = 0;
@@ -703,9 +698,9 @@
wh.length = wh.data_length + sizeof(WaveHeader);
#ifdef __WXMSW__
- unlink(filename); // buggy, sigh!
+ unlink(mFileName.c_str()); // buggy, sigh!
#endif
- ofstream os(filename, ios::out | ios::binary | ios::trunc);
+ ofstream os(mFileName.c_str(), ios::out | ios::binary | ios::trunc);
os.write((char *)&wh, sizeof(wh));
os.write((char *)data, length * sizeof(short));
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2010-07-11 21:19:45 UTC (rev 788)
+++ trunk/jazz/src/Sample.h 2010-07-11 21:45:22 UTC (rev 789)
@@ -258,10 +258,10 @@
return pitch;
}
- void SetFilename(const char *fname);
- const char *GetFilename() const
+ void SetFileName(const std::string& FileName);
+ const std::string& GetFileName() const
{
- return filename;
+ return mFileName;
}
int GetLength() const
@@ -412,7 +412,7 @@
tSampleSet& set;
std::string mLabel;
- char* filename;
+ std::string mFileName;
int volume;
int pan;
int pitch; // delta pitch
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-07-11 21:19:45 UTC (rev 788)
+++ trunk/jazz/src/SampleWindow.cpp 2010-07-11 21:45:22 UTC (rev 789)
@@ -219,7 +219,7 @@
player(p),
spl(s)
{
- visible = FALSE;
+ visible = false;
x = 0;
}
@@ -301,7 +301,7 @@
sel_fr = sel_to = -1;
mouse_up_sets_insertion_point = 0;
playpos = new tSamplePlayPosition(*this, gpMidiPlayer, spl);
- midi_time = TRUE;
+ midi_time = true;
midi_offs = 0;
mouse_down = 0;
}
@@ -340,7 +340,7 @@
if (MouseEvent.LeftDown())
{
mouse_up_sets_insertion_point = 0;
- mouse_down = TRUE;
+ mouse_down = true;
if (snapsel.IsSelected())
{
snapsel.Draw(*pDc, 0, 0);
@@ -358,7 +358,7 @@
}
else if (MouseEvent.LeftUp())
{
- mouse_down = FALSE;
+ mouse_down = false;
snapsel.ProcessMouseEvent(MouseEvent, 0, 0);
if (snapsel.IsSelected())
{
@@ -668,16 +668,16 @@
static JZToolDef tdefs[] =
{
- { wxID_OPEN, FALSE, open_xpm, "open wave file" },
- { wxID_SAVE, FALSE, save_xpm, "save wave file" },
+ { wxID_OPEN, false, open_xpm, "open wave file" },
+ { wxID_SAVE, false, save_xpm, "save wave file" },
{ JZToolBar::eToolBarSeparator },
- { wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom to selection" },
- { wxID_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out" },
- { MEN_ACCEPT, FALSE, accept_xpm, "accept painting" },
- { ID_PAINTER_NONE, FALSE, cancel_xpm, "cancel painting" },
+ { wxID_ZOOM_IN, false, zoomin_xpm, "zoom to selection" },
+ { wxID_ZOOM_OUT, false, zoomout_xpm, "zoom out" },
+ { MEN_ACCEPT, false, accept_xpm, "accept painting" },
+ { ID_PAINTER_NONE, false, cancel_xpm, "cancel painting" },
{ JZToolBar::eToolBarSeparator },
- { ID_PLAY, FALSE, play_xpm, "play sample" },
- { MEN_HELP, FALSE, help_xpm, "help" },
+ { ID_PLAY, false, play_xpm, "play sample" },
+ { MEN_HELP, false, help_xpm, "help" },
{ JZToolBar::eToolBarEnd }
};
@@ -692,11 +692,11 @@
tSample *tSampleWin::copy_buffer;
-tSampleWin::tSampleWin(wxWindow* pParent, tSampleWin **ref, tSample &sample)
+tSampleWin::tSampleWin(wxWindow* pParent, tSampleWin **ref, tSample& sample)
: wxFrame(
pParent,
wxID_ANY,
- (char *)sample.GetFilename(),
+ sample.GetFileName(),
wxPoint(geo[0], geo[1]),
wxSize(geo[2], geo[3])),
spl(sample),
@@ -707,7 +707,7 @@
{
this->ref = ref;
- in_constructor = TRUE;
+ in_constructor = true;
cnvs = 0;
mpToolBar = 0;
@@ -820,7 +820,7 @@
// zoom_scrol->SetValue(0);
zoom_scrol->SetScrollbar(0, 10, 1000, 100);
- in_constructor = FALSE;
+ in_constructor = false;
// now force a resize for motif
int cw, ch;
@@ -858,7 +858,7 @@
bool tSampleWin::OnClose()
{
- return TRUE;
+ return true;
}
@@ -911,14 +911,14 @@
if (cnvs->sel_fr == cnvs->sel_to && cnvs->sel_fr >= 0)
{
offs = cnvs->sel_fr;
- return TRUE;
+ return true;
}
else
{
offs = -1;
if (warn)
wxMessageBox("please set insertion point first", "Error", wxOK);
- return FALSE;
+ return false;
}
}
@@ -928,18 +928,18 @@
{
fr_smpl = cnvs->sel_fr;
to_smpl = cnvs->sel_to;
- return TRUE;
+ return true;
}
else if (mode == SelAll)
{
fr_smpl = 0;
to_smpl = spl.GetLength();
- return TRUE;
+ return true;
}
fr_smpl = to_smpl = -1;
if (mode == SelWarn)
wxMessageBox("please select samples first", "Error", wxOK);
- return FALSE;
+ return false;
}
@@ -979,7 +979,7 @@
void tSampleWin::LoadError(tSample &spl)
{
char buf[500];
- sprintf(buf, "could not load \"%s\"", spl.GetFilename());
+ sprintf(buf, "could not load \"%s\"", spl.GetFileName());
wxMessageBox(buf, "Error", wxOK);
}
@@ -1003,7 +1003,7 @@
case ID_EFFECTS_EQUALIZER:
if (equalizer == 0)
equalizer = new tEqualizer(*this);
- equalizer->Show(TRUE);
+ equalizer->Show(true);
break;
case MEN_FLIP_LEFT:
@@ -1016,7 +1016,7 @@
case ID_EFFECTS_DISTORTION:
if (distortion == 0)
distortion = new tDistortion(*this);
- distortion->Show(TRUE);
+ distortion->Show(true);
break;
case ID_EFFECTS_REVERB:
@@ -1031,7 +1031,7 @@
}
ClearSelection();
SetViewPos(0, spl.GetLength());
- reverb->Show(TRUE);
+ reverb->Show(true);
#endif
break;
@@ -1050,14 +1050,14 @@
#ifdef OBSOLETE
if (shifter == 0)
{
- shifter = new wxDialogBox(this, "Shifter", FALSE );
+ shifter = new wxDialogBox(this, "Shifter", false );
tShifterForm *form = new tShifterForm(*this);
form->EditForm(shifter);
shifter->Fit();
}
ClearSelection();
SetViewPos(0, spl.GetLength());
- shifter->Show(TRUE);
+ shifter->Show(true);
#endif
break;
@@ -1065,14 +1065,14 @@
#ifdef OBSOLETE
if (stretcher == 0)
{
- stretcher = new wxDialogBox(this, "Stretcher", FALSE );
+ stretcher = new wxDialogBox(this, "Stretcher", false );
tStretcherForm *form = new tStretcherForm(*this);
form->EditForm(stretcher);
stretcher->Fit();
}
ClearSelection();
SetViewPos(0, spl.GetLength());
- stretcher->Show(TRUE);
+ stretcher->Show(true);
#endif
break;
@@ -1080,12 +1080,12 @@
#ifdef OBSOLETE
if (filter == 0)
{
- filter = new wxDialogBox(this, "Filter", FALSE );
+ filter = new wxDialogBox(this, "Filter", false );
tSplFilterForm *form = new tSplFilterForm(*this);
form->EditForm(filter);
filter->Fit();
}
- filter->Show(TRUE);
+ filter->Show(true);
#endif
break;
@@ -1093,12 +1093,12 @@
#ifdef OBSOLETE
if (settings == 0)
{
- settings = new wxDialogBox(this, "Settings", FALSE );
+ settings = new wxDialogBox(this, "Settings", false );
tSmplWinSettingsForm *form = new tSmplWinSettingsForm(*this);
form->EditForm(settings);
settings->Fit();
}
- settings->Show(TRUE);
+ settings->Show(true);
#endif
break;
@@ -1106,14 +1106,14 @@
#ifdef OBSOLETE
if (echo == 0)
{
- echo = new wxDialogBox(this, "Echo", FALSE );
+ echo = new wxDialogBox(this, "Echo", false );
tEchoForm *form = new tEchoForm(*this);
form->EditForm(echo);
echo->Fit();
}
ClearSelection();
SetViewPos(0, spl.GetLength());
- echo->Show(TRUE);
+ echo->Show(true);
#endif
break;
@@ -1121,21 +1121,21 @@
#ifdef OBSOLETE
if (chorus == 0)
{
- chorus = new wxDialogBox(this, "Chorus", FALSE );
+ chorus = new wxDialogBox(this, "Chorus", false );
tChorusForm *form = new tChorusForm(*this);
form->EditForm(chorus);
chorus->Fit();
}
ClearSelection();
SetViewPos(0, spl.GetLength());
- chorus->Show(TRUE);
+ chorus->Show(true);
#endif
break;
case ID_EFFECTS_SYNTH:
if (synth == 0)
synth = new tSynthDlg(*this);
- synth->Show(TRUE);
+ synth->Show(true);
break;
case MEN_ACCEPT:
@@ -1209,12 +1209,12 @@
#ifdef OBSOLETE
if (wah_settings == 0)
{
- wah_settings = new wxDialogBox(this, "Filter Painter", FALSE);
+ wah_settings = new wxDialogBox(this, "Filter Painter", false);
tWahSettingsForm *form = new tWahSettingsForm(*this);
form->EditForm(wah_settings);
wah_settings->Fit();
}
- wah_settings->Show(TRUE);
+ wah_settings->Show(true);
#endif
break;
@@ -1227,7 +1227,7 @@
form->EditForm(pitch_settings);
pitch_settings->Fit();
}
- pitch_settings->Show(TRUE);
+ pitch_settings->Show(true);
#endif
break;
@@ -1252,7 +1252,7 @@
case wxID_PASTE:
{
int offs, fr, to;
- if (HaveInsertionPoint(offs, FALSE))
+ if (HaveInsertionPoint(offs, false))
{
spl.PasteIns(*copy_buffer, offs);
cnvs->SetSelection(offs, offs + copy_buffer->GetLength());
@@ -1308,7 +1308,7 @@
case ID_FILE_REVERT_TO_SAVED:
cnvs->ClearSelection();
- if (spl.Load(TRUE))
+ if (spl.Load(true))
LoadError(spl);
Redraw();
break;
@@ -1324,54 +1324,50 @@
case wxID_OPEN:
{
- char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(
- defname,
+ wxString FileName = file_selector(
+ spl.GetFileName(),
"Load Sample",
- FALSE,
- FALSE,
+ false,
+ false,
"*.wav");
- if (!fname.empty())
+ if (!FileName.empty())
{
wxBeginBusyCursor();
cnvs->ClearSelection();
- spl.SetFilename(fname);
- if (spl.Load(TRUE))
+ spl.SetFileName(FileName);
+ if (spl.Load(true))
{
LoadError(spl);
}
spl->RefreshDialogs();
- SetTitle(fname);
+ SetTitle(FileName);
Redraw();
wxEndBusyCursor();
}
- delete [] defname;
}
break;
case wxID_SAVEAS:
{
- char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(
- defname,
+ wxString FileName = file_selector(
+ spl.GetFileName(),
"Save Sample",
- TRUE,
- FALSE,
+ true,
+ false,
"*.wav");
- if (!fname.empty())
+ if (!FileName.empty())
{
- spl.SetFilename(fname);
+ spl.SetFileName(FileName);
OnMenuCommand(wxID_SAVE);
spl->RefreshDialogs();
- SetTitle(fname);
+ SetTitle(FileName);
}
- delete [] defname;
}
break;
case wxID_SAVE:
{
- if (spl.GetFilename()[0] == 0)
+ if (spl.GetFileName().empty())
{
OnMenuCommand(wxID_SAVEAS);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-11 21:19:51
|
Revision: 788
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=788&view=rev
Author: pstieber
Date: 2010-07-11 21:19:45 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
1. Added a new version of the audio samples dialog (Dialogs/SamplesDialog.cpp.h) to replace the use of
tSamplesDlg. I added the controls and laid them out, but the dialog is not functioning.
2. Changes an unnamed enumeration in tSampleSet that held MAXSMPL to a named enumeration (TESampleSize)
with a single entry called eSampleCount, and made the enumeration public.
3. Changed the sample class label data member from a char* to a std::string.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Makefile.am
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/Sample.cpp
trunk/jazz/src/Sample.h
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/SamplesDialog.cpp
trunk/jazz/src/Dialogs/SamplesDialog.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Audio.cpp 2010-07-11 21:19:45 UTC (rev 788)
@@ -22,6 +22,7 @@
#include "Audio.h"
+#include "Dialogs/SamplesDialog.h"
#include "Sample.h"
#include "Events.h"
#include "RecordingInfo.h"
@@ -211,7 +212,7 @@
is_playing = 0;
dirty = 0;
- for (i = 0; i < MAXSMPL; i++)
+ for (i = 0; i < eSampleCount; i++)
{
mSamples[i] = new tSample(*this);
mSampleWindows[i] = 0;
@@ -229,7 +230,7 @@
tSampleSet::~tSampleSet()
{
int i;
- for (i = 0; i < MAXSMPL; i++)
+ for (i = 0; i < eSampleCount; i++)
{
delete mSamples[i];
delete mSampleWindows[i];
@@ -280,7 +281,7 @@
gpMidiPlayer->SetAudioEnabled(true);
wxBeginBusyCursor();
- for (int i = 0; i < MAXSMPL; i++)
+ for (int i = 0; i < eSampleCount; i++)
{
mSamples[i]->Clear();
}
@@ -319,7 +320,7 @@
::wxMessageBox(String, "Error", wxOK);
continue;
}
- assert(0 <= key && key < MAXSMPL);
+ assert(0 <= key && key < eSampleCount);
mSamples[key]->SetFilename(SplFilePath.c_str());
mSamples[key]->SetLabel(Label.c_str());
mSamples[key]->SetVolume(vol);
@@ -348,7 +349,7 @@
//-----------------------------------------------------------------------------
void tSampleSet::ReloadSamples()
{
- for (int i = 0; i < MAXSMPL; i++)
+ for (int i = 0; i < eSampleCount; i++)
{
mSamples[i]->Load(dirty);
}
@@ -359,23 +360,22 @@
//-----------------------------------------------------------------------------
int tSampleSet::Save(const wxString& FileName)
{
- ofstream os(FileName.c_str());
- os << 1 << " " << speed << " " << channels << " " << softsync << endl;
- for (int i = 0; i < MAXSMPL; i++)
+ ofstream Ofs(FileName.c_str());
+ Ofs << 1 << ' ' << speed << ' ' << channels << ' ' << softsync << endl;
+ for (int i = 0; i < eSampleCount; i++)
{
- tSample *spl = mSamples[i];
- const char *fname = spl->GetFilename();
- const char* pLabel = spl->GetLabel();
- int vol = spl->GetVolume();
- int pan = spl->GetPan();
- int pitch = spl->GetPitch();
+ tSample* pSample = mSamples[i];
+ const char* fname = pSample->GetFilename();
+ int vol = pSample->GetVolume();
+ int pan = pSample->GetPan();
+ int pitch = pSample->GetPitch();
if (fname[0])
{
- os << i << " ";
- WriteString(os, fname);
- os << " ";
- WriteString(os, pLabel);
- os << " " << pan << " " << vol << " " << pitch << endl;
+ Ofs << i << ' ';
+ WriteString(Ofs, fname);
+ Ofs << ' ';
+ WriteString(Ofs, pSample->GetLabel());
+ Ofs << ' ' << pan << ' ' << vol << ' ' << pitch << endl;
}
}
return 0;
@@ -383,13 +383,14 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-const char* tSampleSet::GetSampleName(int i)
+const string& tSampleSet::GetSampleLabel(int Index)
{
- if (0 <= i && i < MAXSMPL)
+ if (Index >= 0 && Index < eSampleCount)
{
- return mSamples[i]->GetLabel();
+ return mSamples[Index]->GetLabel();
}
- return "";
+ static string EmptyString;
+ return EmptyString;
}
//-----------------------------------------------------------------------------
@@ -611,7 +612,7 @@
ReloadSamples();
// touch all playback sample data, so they may get swapped into memory
- for (int i = 0; i < MAXSMPL; i++)
+ for (int i = 0; i < eSampleCount; i++)
{
tSample *spl = mSamples[i];
spl->GotoRAM();
@@ -627,6 +628,7 @@
is_playing = 0;
}
+#if 0
//*****************************************************************************
// Description:
// This is the sample dialog.
@@ -672,7 +674,7 @@
wxText* pFile;
#endif // OBSOLETE
- static char *path;
+ static char* mpSamplePath;
static int current;
char *ListEntry(int i);
@@ -680,6 +682,7 @@
void Win2Sample(int index);
void SetCurrentListEntry(int i);
};
+#endif
// -----------------------------------------------------------------
// ------------------------ global settings ------------------------
@@ -899,7 +902,7 @@
{
return;
}
- for (int i = 0; i < MAXSMPL; ++i)
+ for (int i = 0; i < eSampleCount; ++i)
{
mSamples[i]->Clear();
}
@@ -951,7 +954,7 @@
tSample *spl;
// see if fname is already present in sample list
- for (i = 0; i < MAXSMPL; i++)
+ for (i = 0; i < eSampleCount; i++)
{
spl = mSamples[i];
if (strcmp(spl->GetFilename(), fname) == 0)
@@ -959,10 +962,10 @@
}
// if no entry is there, add an entry
- if (i >= MAXSMPL)
+ if (i >= eSampleCount)
{
// start somewhere near the top of the list
- for (i = 15; i < MAXSMPL; i++)
+ for (i = 15; i < eSampleCount; i++)
{
spl = mSamples[i];
if (spl->GetFilename()[0] == 0)
@@ -970,7 +973,7 @@
}
}
- if (i >= MAXSMPL)
+ if (i >= eSampleCount)
return;
int key = i;
@@ -1114,11 +1117,11 @@
// ------------------------ sample settings ------------------------
// -----------------------------------------------------------------
-
+#if 0
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-char * tSamplesDlg::path = 0;
-int tSamplesDlg::current = 0;
+char* tSamplesDlg::mpSamplePath = 0;
+int tSamplesDlg::current = 0;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -1126,13 +1129,13 @@
: wxDialog(pParent, wxID_ANY, wxString("Sample Settings")),
set(s)
{
- if (path == 0)
+ if (mpSamplePath == 0)
{
- path = copystring("*.wav");
+ mpSamplePath = copystring("*.wav");
}
wxArrayString SampleNames;
- for (int i = 0; i < tSampleSet::MAXSMPL; i++)
+ for (int i = 0; i < tSampleSet::eSampleCount; ++i)
{
SampleNames.Add(ListEntry(i));
}
@@ -1182,7 +1185,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-char *tSamplesDlg::ListEntry(int i)
+char* tSamplesDlg::ListEntry(int i)
{
ostringstream Oss;
Oss << i + 1 << ' ' << set.mSamples[i]->GetLabel();
@@ -1241,7 +1244,9 @@
void tSamplesDlg::OnCloseButton()
{
if (set.is_playing)
+ {
return;
+ }
Win2Sample(current);
wxBeginBusyCursor();
set.ReloadSamples();
@@ -1255,12 +1260,18 @@
//-----------------------------------------------------------------------------
void tSamplesDlg::OnAddButton()
{
- wxString fname = file_selector(path, "Load Sample", false, false, "*.wav");
- if (fname)
+ wxString FileName = file_selector(
+ mpSamplePath,
+ "Load Sample",
+ false,
+ false,
+ "*.wav");
+
+ if (FileName)
{
#ifdef OBSOLETE
- file->SetValue(fname);
- pLabel->SetValue(wxFileNameFromPath(fname));
+ file->SetValue(FileName);
+ pLabel->SetValue(wxFileNameFromPath(FileName));
#endif
Win2Sample(current);
SetCurrentListEntry(current);
@@ -1365,6 +1376,7 @@
((tSamplesDlg *)itm.GetParent())->OnListClick();
}
#endif // OBSOLETE
+#endif
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -1377,7 +1389,7 @@
}
if (mpSampleDialog == 0)
{
- mpSampleDialog = new tSamplesDlg(gpTrackWindow, *this);
+ mpSampleDialog = new JZSamplesDialog(gpTrackWindow, *this);
}
mpSampleDialog->Show(true);
}
@@ -1388,6 +1400,6 @@
{
if (mpSampleDialog)
{
- mpSampleDialog->Sample2Win(mpSampleDialog->current);
+// mpSampleDialog->Sample2Win(mpSampleDialog->current);
}
}
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Audio.h 2010-07-11 21:19:45 UTC (rev 788)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -219,7 +219,7 @@
// tSampleSet
// =============================================================
-class tSamplesDlg;
+class JZSamplesDialog;
//*****************************************************************************
//*****************************************************************************
@@ -230,13 +230,17 @@
friend class tSampleVoice;
friend class tSample;
friend class tAudioGloblForm;
- friend class tSamplesDlg;
friend class JZWindowsAudioPlayer;
friend class tAudioPlayer;
friend class tAlsaAudioPlayer;
public:
+ enum TESampleSize
+ {
+ eSampleCount = 128
+ };
+
tSampleSet(long ticks_per_minute);
virtual ~tSampleSet();
@@ -338,7 +342,7 @@
return (long)(0.001 * time * speed * channels);
}
- virtual const char *GetSampleName(int i);
+ virtual const std::string& GetSampleLabel(int Index);
void StartPlay(long clock);
@@ -401,12 +405,8 @@
int bits; // must be 16!
bool softsync; // enable software midi/audio sync
- enum
- {
- MAXSMPL = 128
- };
- tSample* mSamples[MAXSMPL];
- tSampleWin* mSampleWindows[MAXSMPL];
+ tSample* mSamples[eSampleCount];
+ tSampleWin* mSampleWindows[eSampleCount];
long ticks_per_minute; // midi speed for audio/midi sync
double clocks_per_buffer;
@@ -425,7 +425,7 @@
long buffers_written; // for computing buffers clock
wxDialog* mpGlobalSettingsDialog;
- tSamplesDlg* mpSampleDialog;
+ JZSamplesDialog* mpSampleDialog;
tEventArray* events;
Added: trunk/jazz/src/Dialogs/SamplesDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SamplesDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/SamplesDialog.cpp 2010-07-11 21:19:45 UTC (rev 788)
@@ -0,0 +1,181 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2010 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "SamplesDialog.h"
+
+#include "../Audio.h"
+
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZSamplesDialog::JZSamplesDialog(wxWindow* pParent, tSampleSet& SampleSet)
+ : wxDialog(pParent, wxID_ANY, wxString("Samples Settings")),
+ mpListBox(0),
+ mpLabelEdit(0),
+ mpFileNameEdit(0),
+ mpFileNameBrowseButton(0),
+ mpVolumeSlider(0),
+ mpPanSlider(0),
+ mpPitchSlider(0)
+{
+ wxArrayString SampleNames;
+ for (int Index = 0; Index < tSampleSet::eSampleCount; ++Index)
+ {
+ wxString Entry;
+ Entry << Index + 1 << ' ' << SampleSet.GetSampleLabel(Index);
+ SampleNames.push_back(Entry);
+ }
+
+ mpListBox = new wxListBox(
+ this,
+ wxID_ANY,
+ wxDefaultPosition,
+ wxDefaultSize,
+ SampleNames,
+ wxLB_SINGLE);
+
+ mpLabelEdit = new wxTextCtrl(this, wxID_ANY);
+
+ mpFileNameEdit = new wxTextCtrl(this, wxID_ANY);
+
+ mpFileNameBrowseButton = new wxButton(
+ this,
+ wxID_ANY,
+// IDC_BN_SD_FILE_SELECT_BROWSE,
+ "Browse...");
+
+ mpVolumeSlider = new wxSlider(
+ this,
+ wxID_ANY,
+ 64,
+ 0,
+ 127,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxSL_LABELS);
+
+ mpPanSlider = new wxSlider(
+ this,
+ wxID_ANY,
+ 0,
+ -63,
+ 63,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxSL_LABELS);
+
+ mpPitchSlider = new wxSlider(
+ this,
+ wxID_ANY,
+ 0,
+ -12,
+ 12,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxSL_LABELS);
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+ wxFlexGridSizer* pFlexGridSizer;
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Samples"),
+ 0,
+ wxLEFT | wxALL,
+ 3);
+ pTopSizer->Add(mpListBox, 0, wxGROW | wxALL, 3);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 2, 4, 2);
+ pFlexGridSizer->AddGrowableCol(1);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Sample Label:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpLabelEdit,
+ 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxGROW | wxALL, 5);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Sample File Name:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpFileNameEdit,
+ 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpFileNameBrowseButton,
+ 0,
+ wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxGROW | wxALL, 5);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Volume"),
+ 0,
+ wxCENTER | wxALL,
+ 3);
+ pTopSizer->Add(mpVolumeSlider, 0, wxGROW | wxALL, 3);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Pan"),
+ 0,
+ wxCENTER | wxALL,
+ 3);
+ pTopSizer->Add(mpPanSlider, 0, wxGROW | wxALL, 3);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Pitch"),
+ 0,
+ wxCENTER | wxALL,
+ 3);
+ pTopSizer->Add(mpPitchSlider, 0, wxGROW | wxALL, 3);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
Property changes on: trunk/jazz/src/Dialogs/SamplesDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/SamplesDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SamplesDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/SamplesDialog.h 2010-07-11 21:19:45 UTC (rev 788)
@@ -0,0 +1,53 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2010 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_SAMPLESDIALOG_H
+#define JZ_SAMPLESDIALOG_H
+
+#include <wx/dialog.h>
+
+class tSampleSet;
+class wxButton;
+class wxListBox;
+class wxSlider;
+class wxTextCtrl;
+
+//*****************************************************************************
+// Description:
+// This is the sample dialog class declaration.
+//*****************************************************************************
+class JZSamplesDialog : public wxDialog
+{
+ public:
+
+ JZSamplesDialog(wxWindow* pParent, tSampleSet& SampleSet);
+
+ private:
+
+ wxListBox* mpListBox;
+ wxTextCtrl* mpLabelEdit;
+ wxTextCtrl* mpFileNameEdit;
+ wxButton* mpFileNameBrowseButton;
+ wxSlider* mpVolumeSlider;
+ wxSlider* mpPanSlider;
+ wxSlider* mpPitchSlider;
+};
+
+#endif // !defined(JZ_SAMPLESDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/SamplesDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Makefile.am 2010-07-11 21:19:45 UTC (rev 788)
@@ -36,6 +36,7 @@
Dialogs/PitchWheelDialog.cpp \
Dialogs/ProgramChangeDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SamplesDialog.cpp \
Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/SetTempoDialog.cpp \
Dialogs/ShiftDialog.cpp \
@@ -132,6 +133,7 @@
Dialogs/PitchWheelDialog.cpp \
Dialogs/ProgramChangeDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SamplesDialog.cpp \
Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/SetTempoDialog.cpp \
Dialogs/ShiftDialog.cpp \
@@ -233,6 +235,7 @@
Dialogs/PitchWheelDialog.h \
Dialogs/ProgramChangeDialog.h \
Dialogs/QuantizeDialog.h \
+Dialogs/SamplesDialog.h \
Dialogs/SearchAndReplaceDialog.h \
Dialogs/SetTempoDialog.h \
Dialogs/ShiftDialog.h \
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/PianoWindow.cpp 2010-07-11 21:19:45 UTC (rev 788)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -1336,7 +1336,7 @@
Dc.SetFont(*mpDrumFont);
while (Pitch >= 0 && y < mEventsY + mEventsHeight)
{
- Dc.DrawText(gpMidiPlayer->GetSampleName(Pitch), mLittleBit, y);
+ Dc.DrawText(gpMidiPlayer->GetSampleLabel(Pitch), mLittleBit, y);
y += mTrackHeight;
--Pitch;
}
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Player.h 2010-07-11 21:19:45 UTC (rev 788)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -261,9 +261,9 @@
return 0;
}
- virtual const char *GetSampleName(int i)
+ virtual const std::string& GetSampleLabel(int Index)
{
- return mSamples.GetSampleName(i);
+ return mSamples.GetSampleLabel(Index);
}
virtual void AdjustAudioLength(JZTrack *t)
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Sample.cpp 2010-07-11 21:19:45 UTC (rev 788)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -28,26 +28,24 @@
#include "DeprecatedStringUtils.h"
#include "Mapper.h"
+#include <cassert>
+#include <cmath>
#include <cstdlib>
-#include <iostream>
+#include <cstring>
#include <fstream>
-#include <cmath>
-using namespace std;
-
-#include <assert.h>
#include <sys/stat.h>
-#include <string.h>
+using namespace std;
tSample::tSample(tSampleSet &s)
- : set(s)
+ : set(s),
+ mLabel()
{
data = 0;
length = 0;
external_flag = 1; // auto reload when file changes on disk
external_time = 0;
- label = copystring("");
filename = copystring("");
volume = 127;
pan = 0;
@@ -59,14 +57,12 @@
tSample::~tSample()
{
delete [] data;
- delete [] label;
delete [] filename;
}
-void tSample::SetLabel(const char *str)
+void tSample::SetLabel(const std::string& Label)
{
- delete [] label;
- label = copystring(str);
+ mLabel = Label;
}
void tSample::SetFilename(const char *fname)
@@ -75,7 +71,7 @@
{
dirty = 1;
char *s = copystring(fname);
- label = copystring(wxFileNameFromPath(s));
+ mLabel = wxFileNameFromPath(s);
delete [] s;
}
delete [] filename;
@@ -85,8 +81,7 @@
void tSample::Clear()
{
FreeData();
- delete [] label;
- label = copystring("");
+ mLabel.clear();
delete [] filename;
filename = copystring("");
volume = 127;
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/src/Sample.h 2010-07-11 21:19:45 UTC (rev 788)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -25,12 +25,12 @@
class tSampleSet;
+#include <cmath>
+#include <cstring>
#include <iostream>
-#include <cmath>
+#include <string>
-#include <assert.h>
#include <sys/stat.h>
-#include <string.h>
#include "SignalInterface.h"
@@ -219,10 +219,10 @@
int Save();
// Properties
- void SetLabel(const char *str);
- const char *GetLabel() const
+ void SetLabel(const std::string& Label);
+ const std::string& GetLabel() const
{
- return label;
+ return mLabel;
}
void SetVolume(int vol)
@@ -400,12 +400,18 @@
void FreeData();
void MakeData(int length, int zero = 1);
- int Convert(std::istream& is, int byte_count, int channels, int bits, int speed);
+ int Convert(
+ std::istream& is,
+ int byte_count,
+ int channels,
+ int bits,
+ int speed);
+
int length; // number of shorts
short* data; // signed shorts
tSampleSet& set;
- char* label; // msvc cannot delete 'const char *' ????
+ std::string mLabel;
char* filename;
int volume;
int pan;
@@ -421,7 +427,6 @@
int external_flag; // reload on disk change?
int external_time; // last modified on disk
-
};
#endif // !defined(JZ_SAMPLE_H)
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-07-03 14:12:43 UTC (rev 787)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-07-11 21:19:45 UTC (rev 788)
@@ -1241,6 +1241,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SamplesDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SamplesDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\SearchAndReplaceDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-07-03 14:12:49
|
Revision: 787
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=787&view=rev
Author: pstieber
Date: 2010-07-03 14:12:43 +0000 (Sat, 03 Jul 2010)
Log Message:
-----------
1. Separated the location of the help file into a separate function.
2. Allowed the user to opt out of finding the help file earlier in the process.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2010-05-10 17:04:56 UTC (rev 786)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2010-07-03 14:12:43 UTC (rev 787)
@@ -145,11 +145,6 @@
mpProject = new JZProject;
gpProject = mpProject;
- wxConfigBase* pConfig = wxConfigBase::Get();
-
- // Let the help system store the Jazz++ help configuration info.
- mHelp.UseConfig(pConfig);
-
// Call base class function. This is needed for command line parsing.
wxApp::OnInit();
@@ -161,6 +156,20 @@
// Show it and tell the application that it's our main window
SetTopWindow(mpTrackFrame);
+ ConfigureHelp();
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZJazzPlusPlusApplication::ConfigureHelp()
+{
+ wxConfigBase* pConfig = wxConfigBase::Get();
+
+ // Let the help system store the Jazz++ help configuration info.
+ mHelp.UseConfig(pConfig);
+
// This code should be distributed with a HelpFiles subdirectory under
// the directory the executable is stored in on Windows and under the
// ${prefix}/shared/${appname} on Linux.
@@ -233,8 +242,6 @@
pConfig->Write("/Paths/Help", HelpFilePath);
}
}
-
- return true;
}
//-----------------------------------------------------------------------------
@@ -330,43 +337,56 @@
//-----------------------------------------------------------------------------
// Description:
-// The help file was not found so let the user search for it. If it is
-// found, create a configuration entry so the code can find the help file path
-// the next time it starts.
+// This function walks the user through a top-level help file search. If
+// the help file is found, create a configuration entry so the code can find
+// the help file path the next time the application starts.
+//
+// Outputs:
+// wxString& HelpFilePath:
+// A user-selected path to the help file. The calling code should check
+// to insure the help file is actually in this path.
//-----------------------------------------------------------------------------
bool JZJazzPlusPlusApplication::FindAndRegisterHelpFilePath(
wxString& HelpFilePath) const
{
wxString Message;
- Message = "Unable to find " + mHelpFileName;
- ::wxMessageBox(Message, "Please Locate This File!");
+ Message =
+ "Unable to find " + mHelpFileName + "\n" +
+ "Would you like to locate this file?";
+ int Response = ::wxMessageBox(
+ Message,
+ "Cannnot Find Help File",
+ wxOK | wxCANCEL);
- // Use an open dialog to find the help file.
- wxFileDialog OpenDialog(
- 0,
- "Open the Help File",
- HelpFilePath,
- mHelpFileName,
- "*.hhp",
- wxFD_OPEN);
-
- if (OpenDialog.ShowModal() == wxID_OK)
+ if (Response == wxOK)
{
- // Generate a c-style string that contains a path to the help file.
- wxString TempHelpFilePath;
- TempHelpFilePath = ::wxPathOnly(OpenDialog.GetPath());
- TempHelpFilePath += ::wxFileName::GetPathSeparator();
+ // Use an open dialog to find the help file.
+ wxFileDialog OpenDialog(
+ 0,
+ "Open the Help File",
+ HelpFilePath,
+ mHelpFileName,
+ "*.hhp",
+ wxFD_OPEN);
- wxConfigBase* pConfig = wxConfigBase::Get();
- if (pConfig)
+ if (OpenDialog.ShowModal() == wxID_OK)
{
- pConfig->Write("/Paths/Help", TempHelpFilePath);
- }
+ // Generate a string that contains a path to the help file.
+ wxString TempHelpFilePath;
+ TempHelpFilePath = ::wxPathOnly(OpenDialog.GetPath());
+ TempHelpFilePath += ::wxFileName::GetPathSeparator();
- // Return the user selected help file path.
- HelpFilePath = TempHelpFilePath;
+ wxConfigBase* pConfig = wxConfigBase::Get();
+ if (pConfig)
+ {
+ pConfig->Write("/Paths/Help", TempHelpFilePath);
+ }
- return true;
+ // Return the user selected help file path.
+ HelpFilePath = TempHelpFilePath;
+
+ return true;
+ }
}
return false;
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2010-05-10 17:04:56 UTC (rev 786)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2010-07-03 14:12:43 UTC (rev 787)
@@ -91,6 +91,8 @@
private:
+ void ConfigureHelp();
+
void InsureConfigurationFileExistence() const;
bool FindAndRegisterHelpFilePath(wxString& HelpFilePath) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 17:05:08
|
Revision: 786
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=786&view=rev
Author: pstieber
Date: 2010-05-10 17:04:56 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Fixed a project configuration error.
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.sln
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.sln
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2010-05-10 17:04:10 UTC (rev 785)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2010-05-10 17:04:56 UTC (rev 786)
@@ -36,7 +36,7 @@
{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|x64.Build.0 = Release VC9|x64
{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.ActiveCfg = Debug VC9|Win32
{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.Build.0 = Debug VC9|Win32
- {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|x64.ActiveCfg = Release VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|x64.ActiveCfg = Debug VC9|x64
{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|x64.Build.0 = Debug VC9|x64
{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.ActiveCfg = Release VC9|Win32
{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.Build.0 = Release VC9|Win32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 17:04:17
|
Revision: 785
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=785&view=rev
Author: pstieber
Date: 2010-05-10 17:04:10 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Added 64-bit builds and change the build directory naming convention.
Modified Paths:
--------------
trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj
trunk/jazz/portmidi/porttime/porttime-VC9.vcproj
Modified: trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj
===================================================================
--- trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj 2010-05-10 17:01:33 UTC (rev 784)
+++ trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj 2010-05-10 17:04:10 UTC (rev 785)
@@ -11,14 +11,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -91,8 +94,8 @@
</Configuration>
<Configuration
Name="Release VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -163,6 +166,156 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\pm_common;..\porttime;..\pm_win"
+ PreprocessorDefinitions="_LIB;DEBUG;PM_CHECK_ERRORS;_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\$(OutDir)\portmidi.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\$(OutDir)\portmidi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\portmidi.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\pm_common;..\porttime;..\pm_win"
+ PreprocessorDefinitions="_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\$(OutDir)\portmidi.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\$(OutDir)\portmidi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\portmidi.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
Modified: trunk/jazz/portmidi/porttime/porttime-VC9.vcproj
===================================================================
--- trunk/jazz/portmidi/porttime/porttime-VC9.vcproj 2010-05-10 17:01:33 UTC (rev 784)
+++ trunk/jazz/portmidi/porttime/porttime-VC9.vcproj 2010-05-10 17:04:10 UTC (rev 785)
@@ -10,14 +10,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -89,8 +92,8 @@
</Configuration>
<Configuration
Name="Debug VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -160,6 +163,154 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ PreprocessorDefinitions="NDEBUG;_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\$(OutDir)\porttime.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\$(OutDir)\porttime.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\porttime.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_LIB;_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\$(OutDir)\porttime.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\$(OutDir)\porttime.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\porttime.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 17:01:40
|
Revision: 784
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=784&view=rev
Author: pstieber
Date: 2010-05-10 17:01:33 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Made cosmetic indentation changes.
Modified Paths:
--------------
trunk/jazz/portmidi/porttime/ptwinmm.c
Modified: trunk/jazz/portmidi/porttime/ptwinmm.c
===================================================================
--- trunk/jazz/portmidi/porttime/ptwinmm.c 2010-05-10 16:54:09 UTC (rev 783)
+++ trunk/jazz/portmidi/porttime/ptwinmm.c 2010-05-10 17:01:33 UTC (rev 784)
@@ -14,8 +14,12 @@
static MMRESULT timer_id;
static PtCallback *time_callback;
-void CALLBACK winmm_time_callback(UINT uID, UINT uMsg, DWORD dwUser,
- DWORD dw1, DWORD dw2)
+void CALLBACK winmm_time_callback(
+ UINT uID,
+ UINT uMsg,
+ DWORD dwUser,
+ DWORD dw1,
+ DWORD dw2)
{
(*time_callback)(Pt_Time(), (void *) dwUser);
}
@@ -29,9 +33,14 @@
time_offset = timeGetTime();
time_started_flag = TRUE;
time_callback = callback;
- if (callback) {
- timer_id = timeSetEvent(resolution, 1, winmm_time_callback,
- (DWORD) userData, TIME_PERIODIC | TIME_CALLBACK_FUNCTION);
+ if (callback)
+ {
+ timer_id = timeSetEvent(
+ resolution,
+ 1,
+ winmm_time_callback,
+ (DWORD) userData,
+ TIME_PERIODIC | TIME_CALLBACK_FUNCTION);
if (!timer_id) return ptHostError;
}
return ptNoError;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 16:54:15
|
Revision: 783
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=783&view=rev
Author: pstieber
Date: 2010-05-10 16:54:09 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Changed WIN32 to _MSC_VER.
Modified Paths:
--------------
trunk/jazz/portmidi/pm_common/pmutil.c
Modified: trunk/jazz/portmidi/pm_common/pmutil.c
===================================================================
--- trunk/jazz/portmidi/pm_common/pmutil.c 2010-05-10 06:05:38 UTC (rev 782)
+++ trunk/jazz/portmidi/pm_common/pmutil.c 2010-05-10 16:54:09 UTC (rev 783)
@@ -8,7 +8,7 @@
#include "pmutil.h"
#include "pminternal.h"
-#ifdef WIN32
+#ifdef _MSC_VER
#define bzero(addr, siz) memset(addr, 0, siz)
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 06:05:44
|
Revision: 782
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=782&view=rev
Author: pstieber
Date: 2010-05-10 06:05:38 +0000 (Mon, 10 May 2010)
Log Message:
-----------
1. Changed FAR PASCAL to CALLBACK.
2. Type cast some function to LPTIMECALLBACK for the 64-bit build.
3. Removed WIN32 from the 64-bit builds.
Modified Paths:
--------------
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-05-10 04:08:59 UTC (rev 781)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-05-10 06:05:38 UTC (rev 782)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@
// handle incoming midi data (internal clock)
-void FAR PASCAL midiIntInputHandler(
+void CALLBACK midiIntInputHandler(
HMIDIIN hMidiIn,
WORD wMsg,
DWORD dwInstance,
@@ -186,12 +186,13 @@
}
}
-
-
-
-
// play output (internal clock)
-void FAR PASCAL midiIntTimerHandler(UINT wTimerId, UINT wMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
+void CALLBACK midiIntTimerHandler(
+ UINT wTimerId,
+ UINT wMsg,
+ DWORD dwUser,
+ DWORD dw1,
+ DWORD dw2)
{
tWinPlayerState *state = (tWinPlayerState *)dwUser;
if ( !state->playing )
@@ -203,7 +204,12 @@
midi_event *m = state->thru_buffer.peek();
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiIntTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiIntTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
(void)state->thru_buffer.get();
@@ -233,7 +239,12 @@
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
// try again later
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiIntTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiIntTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
}
@@ -251,15 +262,16 @@
delay = (long)state->min_timer_period;
else if (delay > (long)state->max_timer_period)
delay = (long)state->max_timer_period;
- timeSetEvent((UINT)delay, state->min_timer_period, midiIntTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ (UINT) delay,
+ state->min_timer_period,
+ (LPTIMECALLBACK) midiIntTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
}
-
-
-
-
// handle incoming midi data (midi clock source) (songpointer)
-void FAR PASCAL midiMidiInputHandler(
+void CALLBACK midiMidiInputHandler(
HMIDIIN hMidiIn,
WORD wMsg,
DWORD dwInstance,
@@ -307,12 +319,13 @@
}
}
-
-
-
-
// play output (midi clock source) (songpointer)
-void FAR PASCAL midiMidiTimerHandler(UINT wTimerId, UINT wMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
+void CALLBACK midiMidiTimerHandler(
+ UINT wTimerId,
+ UINT wMsg,
+ DWORD dwUser,
+ DWORD dw1,
+ DWORD dw2)
{
tWinPlayerState *state = (tWinPlayerState *)dwUser;
if ( !state->playing )
@@ -324,7 +337,12 @@
midi_event *m = state->thru_buffer.peek();
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiMidiTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiMidiTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
(void)state->thru_buffer.get();
@@ -359,7 +377,12 @@
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
// try again later
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiMidiTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiMidiTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
}
@@ -379,15 +402,16 @@
else if (delay > (long)state->max_timer_period)
delay = (long)state->max_timer_period;
- timeSetEvent((UINT)delay, state->min_timer_period, midiMidiTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ (UINT) delay,
+ state->min_timer_period,
+ (LPTIMECALLBACK) midiMidiTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
}
-
-
-
-
// handle incoming midi data (MTC clock source)
-void FAR PASCAL midiMtcInputHandler(
+void CALLBACK midiMtcInputHandler(
HMIDIIN hMidiIn,
WORD wMsg,
DWORD dwInstance,
@@ -494,11 +518,13 @@
}
}
-
-
-
// play output (MTC clock source)
-void FAR PASCAL midiMtcTimerHandler(UINT wTimerId, UINT wMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
+void CALLBACK midiMtcTimerHandler(
+ UINT wTimerId,
+ UINT wMsg,
+ DWORD dwUser,
+ DWORD dw1,
+ DWORD dw2)
{
tWinPlayerState *state = (tWinPlayerState *)dwUser;
if ( !state->playing )
@@ -512,7 +538,12 @@
midi_event *m = state->thru_buffer.peek();
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiMtcTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiMtcTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
(void)state->thru_buffer.get();
@@ -547,7 +578,12 @@
if (midiOutShortMsg(state->hout, m->data) == MIDIERR_NOTREADY)
{
// try again later
- timeSetEvent(state->min_timer_period, state->min_timer_period * 5, midiMtcTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ state->min_timer_period,
+ state->min_timer_period * 5,
+ (LPTIMECALLBACK) midiMtcTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
return;
}
}
@@ -565,11 +601,14 @@
delay = (long)state->min_timer_period;
else if (delay > (long)state->max_timer_period)
delay = (long)state->max_timer_period;
- timeSetEvent((UINT)delay, state->min_timer_period, midiMtcTimerHandler, (DWORD)state, TIME_ONESHOT);
+ timeSetEvent(
+ (UINT) delay,
+ state->min_timer_period,
+ (LPTIMECALLBACK) midiMtcTimerHandler,
+ (DWORD) state,
+ TIME_ONESHOT);
}
-
-
void CALLBACK MidiOutProc(
HMIDIOUT hmo,
UINT wMsg,
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h 2010-05-10 04:08:59 UTC (rev 781)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h 2010-05-10 06:05:38 UTC (rev 782)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -29,13 +29,12 @@
extern "C"
{
-// in win-3.x this has to be in a dll!
-void FAR PASCAL midiIntInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
-void FAR PASCAL midiMidiInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
-void FAR PASCAL midiMtcInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
-void FAR PASCAL midiIntTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
-void FAR PASCAL midiMidiTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
-void FAR PASCAL midiMtcTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
+void CALLBACK midiIntInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
+void CALLBACK midiMidiInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
+void CALLBACK midiMtcInputHandler(HMIDIIN, WORD, DWORD, DWORD, DWORD);
+void CALLBACK midiIntTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
+void CALLBACK midiMidiTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
+void CALLBACK midiMtcTimerHandler(UINT, UINT, DWORD, DWORD, DWORD);
tWinPlayerState FAR * FAR PASCAL NewWinPlayerState();
void FAR PASCAL DeleteWinPlayerState(tWinPlayerState FAR * state);
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2010-05-10 04:08:59 UTC (rev 781)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2010-05-10 06:05:38 UTC (rev 782)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -669,7 +669,12 @@
mpState->virtual_clock = Clock - mpState->ticks_per_signal;
mpState->signal_time = mpState->start_time - 5000L;
// mpState->playing = TRUE;
- timeSetEvent(mpState->min_timer_period, mpState->min_timer_period, midiMidiTimerHandler, (DWORD)mpState, TIME_ONESHOT);
+ timeSetEvent(
+ mpState->min_timer_period,
+ mpState->min_timer_period,
+ (LPTIMECALLBACK) midiMidiTimerHandler,
+ (DWORD) mpState,
+ TIME_ONESHOT);
break;
case CsMtc:
if (!Continue)
@@ -698,8 +703,8 @@
timeSetEvent(
mpState->min_timer_period,
mpState->min_timer_period,
- midiMtcTimerHandler,
- (DWORD)mpState,
+ (LPTIMECALLBACK) midiMtcTimerHandler,
+ (DWORD) mpState,
TIME_ONESHOT);
break;
case CsInt:
@@ -709,8 +714,8 @@
timeSetEvent(
mpState->min_timer_period,
mpState->min_timer_period,
- midiIntTimerHandler,
- (DWORD)mpState,
+ (LPTIMECALLBACK) midiIntTimerHandler,
+ (DWORD) mpState,
TIME_ONESHOT);
break;
}
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-05-10 04:08:59 UTC (rev 781)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-05-10 06:05:38 UTC (rev 782)
@@ -117,7 +117,7 @@
/>
</Configuration>
<Configuration
- Name="Release GUI VC9|Win32"
+ Name="Debug GUI VC9|x64"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -138,22 +138,20 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
+ TargetEnvironment="3"
TypeLibraryName=".\$(OutDir)\JazzPlusPlus.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -172,7 +170,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
/>
@@ -181,17 +179,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw28_xrc.lib wxbase28_xml.lib wxexpat.lib wxmsw28_core.lib wxmsw28_adv.lib wxmsw28_html.lib wxbase28.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
+ AdditionalDependencies="wxmsw28d_xrc.lib wxbase28d_xml.lib wxexpatd.lib wxmsw28d_core.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxbase28d.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -216,7 +215,7 @@
/>
</Configuration>
<Configuration
- Name="Debug GUI VC9|x64"
+ Name="Release GUI VC9|Win32"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -237,20 +236,22 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
+ TargetEnvironment="1"
TypeLibraryName=".\$(OutDir)\JazzPlusPlus.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -269,7 +270,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
/>
@@ -278,18 +279,17 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wxmsw28d_xrc.lib wxbase28d_xml.lib wxexpatd.lib wxmsw28d_core.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxbase28d.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
+ AdditionalDependencies="wxmsw28_xrc.lib wxbase28_xml.lib wxexpat.lib wxmsw28_core.lib wxmsw28_adv.lib wxmsw28_html.lib wxbase28.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -347,7 +347,7 @@
Optimization="3"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -361,6 +361,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
+ CallingConvention="2"
CompileAs="0"
DisableSpecificWarnings="4351"
/>
@@ -456,7 +457,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release GUI VC9|Win32"
+ Name="Debug GUI VC9|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -464,7 +465,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug GUI VC9|x64"
+ Name="Release GUI VC9|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -492,7 +493,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release GUI VC9|Win32"
+ Name="Debug GUI VC9|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -500,7 +501,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug GUI VC9|x64"
+ Name="Release GUI VC9|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1095,22 +1096,22 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release GUI VC9|Win32"
+ Name="Debug GUI VC9|x64"
>
<Tool
Name="VCCustomBuildTool"
+ Description="Performing Custom Help Build Step"
CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
- Outputs="$(InputDir)$(InputName)_contents.html"
+ Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug GUI VC9|x64"
+ Name="Release GUI VC9|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Performing Custom Help Build Step"
CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
- Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
+ Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
<FileConfiguration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 04:09:06
|
Revision: 781
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=781&view=rev
Author: pstieber
Date: 2010-05-10 04:08:59 +0000 (Mon, 10 May 2010)
Log Message:
-----------
1. Updated to wxWidgets 2.8.11.
2. Added 64-bit builds. They don't work, but they have been added.
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.sln
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.sln
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2010-05-10 03:09:56 UTC (rev 780)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2010-05-10 04:08:59 UTC (rev 781)
@@ -13,21 +13,35 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug GUI VC9|Win32 = Debug GUI VC9|Win32
+ Debug GUI VC9|x64 = Debug GUI VC9|x64
Release GUI VC9|Win32 = Release GUI VC9|Win32
+ Release GUI VC9|x64 = Release GUI VC9|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|Win32.ActiveCfg = Debug GUI VC9|Win32
{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|Win32.Build.0 = Debug GUI VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|x64.ActiveCfg = Debug GUI VC9|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|x64.Build.0 = Debug GUI VC9|x64
{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|Win32.ActiveCfg = Release GUI VC9|Win32
{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|Win32.Build.0 = Release GUI VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|x64.ActiveCfg = Release GUI VC9|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|x64.Build.0 = Release GUI VC9|x64
{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|Win32.ActiveCfg = Debug VC9|Win32
{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|Win32.Build.0 = Debug VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|x64.ActiveCfg = Debug VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|x64.Build.0 = Debug VC9|x64
{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|Win32.ActiveCfg = Release VC9|Win32
{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|Win32.Build.0 = Release VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|x64.ActiveCfg = Release VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|x64.Build.0 = Release VC9|x64
{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.ActiveCfg = Debug VC9|Win32
{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.Build.0 = Debug VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|x64.ActiveCfg = Release VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|x64.Build.0 = Debug VC9|x64
{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.ActiveCfg = Release VC9|Win32
{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.Build.0 = Release VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|x64.ActiveCfg = Release VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|x64.Build.0 = Release VC9|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-05-10 03:09:56 UTC (rev 780)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-05-10 04:08:59 UTC (rev 781)
@@ -11,16 +11,18 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug GUI VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -48,7 +50,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -72,7 +74,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -83,7 +85,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -116,10 +118,9 @@
</Configuration>
<Configuration
Name="Release GUI VC9|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -148,7 +149,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -173,7 +174,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -184,7 +185,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -214,6 +215,203 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug GUI VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\JazzPlusPlus.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ ForceConformanceInForLoopScope="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\$(OutDir)\JazzPlusPlus.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ DisableSpecificWarnings="4351"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxmsw28d_xrc.lib wxbase28d_xml.lib wxexpatd.lib wxmsw28d_core.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxbase28d.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
+ OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release GUI VC9|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\JazzPlusPlus.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ ForceConformanceInForLoopScope="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\$(OutDir)\JazzPlusPlus.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ DisableSpecificWarnings="4351"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxmsw28_xrc.lib wxbase28_xml.lib wxexpat.lib wxmsw28_core.lib wxmsw28_adv.lib wxmsw28_html.lib wxbase28.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib opengl32.lib glu32.lib"
+ OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -265,6 +463,22 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug GUI VC9|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GUI VC9|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\src\ClockDialog.h"
@@ -285,6 +499,22 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug GUI VC9|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GUI VC9|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\src\Command.cpp"
@@ -860,7 +1090,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing Custom Help Build Step"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
/>
</FileConfiguration>
@@ -869,10 +1099,29 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug GUI VC9|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing Custom Help Build Step"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GUI VC9|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.11-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ Outputs="$(InputDir)$(InputName)_contents.html"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 03:10:02
|
Revision: 780
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=780&view=rev
Author: pstieber
Date: 2010-05-10 03:09:56 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Updated some menu IDs.
Modified Paths:
--------------
trunk/jazz/src/GuitarFrame.cpp
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/SampleWindow.cpp
Modified: trunk/jazz/src/GuitarFrame.cpp
===================================================================
--- trunk/jazz/src/GuitarFrame.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/GuitarFrame.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
EVT_MENU(MEN_CLEAR, JZGuitarFrame::OnClear)
- EVT_MENU(MEN_SETTINGS, JZGuitarFrame::OnSettings)
+ EVT_MENU(ID_VIEW_SETTINGS, JZGuitarFrame::OnSettings)
EVT_MENU(wxID_HELP, JZGuitarFrame::OnHelp)
@@ -68,15 +68,22 @@
// set the frame icon
// SetIcon(wxICON(mondrian));
- wxMenu* pMenu = new wxMenu;
- pMenu->Append(MEN_CLEAR, "C&lear");
- pMenu->Append(MEN_SETTINGS, "&Settings");
- pMenu->Append(wxID_HELP, "&Help");
- pMenu->Append(wxID_CLOSE, "&Close");
-
+ wxMenu* pMenu = 0;
wxMenuBar* pMenuBar = new wxMenuBar;
- pMenuBar->Append(pMenu, "&Menu");
+ pMenu = new wxMenu;
+ pMenu->Append(wxID_CLOSE, "&Close");
+ pMenuBar->Append(pMenu, "&File");
+
+ pMenu = new wxMenu;
+ pMenu->Append(MEN_CLEAR, "C&lear");
+ pMenu->Append(ID_VIEW_SETTINGS, "&Settings");
+ pMenuBar->Append(pMenu, "&View");
+
+ pMenu = new wxMenu;
+ pMenu->Append(wxID_HELP, "&Help");
+ pMenuBar->Append(pMenu, "&Help");
+
SetMenuBar(pMenuBar);
mpFretBoardWindow = new JZGuitarWindow(this, wxPoint(0, 0), wxSize(600, 120));
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Harmony.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -22,22 +22,23 @@
#include "Harmony.h"
+#include "FileSelector.h"
+#include "Filter.h"
+#include "Globals.h"
+#include "GuitarFrame.h"
+#include "HarmonyBrowserAnalyzer.h"
#include "HarmonyP.h"
-#include "ProjectManager.h"
-#include "Player.h"
-#include "TrackFrame.h"
-#include "TrackWindow.h"
+#include "Help.h"
#include "PianoFrame.h"
#include "PianoWindow.h"
-#include "GuitarFrame.h"
+#include "Player.h"
+#include "ProjectManager.h"
+#include "Rectangle.h"
+#include "Resources.h"
#include "Song.h"
-#include "Filter.h"
#include "ToolBar.h"
-#include "HarmonyBrowserAnalyzer.h"
-#include "FileSelector.h"
-#include "Rectangle.h"
-#include "Globals.h"
-#include "Help.h"
+#include "TrackFrame.h"
+#include "TrackWindow.h"
#include <wx/button.h>
#include <wx/checkbox.h>
@@ -49,8 +50,8 @@
#include <wx/stattext.h>
#include <wx/toolbar.h>
+#include <fstream>
#include <iostream>
-#include <fstream>
using namespace std;
@@ -78,7 +79,6 @@
#define MEN_HAUNSCH 23
#define MEN_ANALYZE 24
#define MEN_IONSCALE 25
-#define MEN_SETTINGS 26
#include "Bitmaps/open.xpm"
@@ -1492,7 +1492,7 @@
TransposeSelection();
break;
- case MEN_SETTINGS:
+ case ID_VIEW_SETTINGS:
SettingsDialog();
break;
@@ -2000,7 +2000,7 @@
// EVT_MENU(MEN_ANALYZE,
// EVT_MENU(MEN_TRANSPOSE,
-// EVT_MENU(MEN_SETTINGS,
+// EVT_MENU(ID_VIEW_SETTINGS,
END_EVENT_TABLE()
@@ -2028,7 +2028,7 @@
wxMenu* pSettingsMenu = new wxMenu;
pSettingsMenu->Append(MEN_EDIT, "&Chord");
- pSettingsMenu->Append(MEN_SETTINGS, "&Global");
+ pSettingsMenu->Append(ID_VIEW_SETTINGS, "&Global");
pSettingsMenu->Append(MEN_MIDI, "&Midi");
pSettingsMenu->Append(
MEN_HAUNSCH,
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Resources.h 2010-05-10 03:09:56 UTC (rev 780)
@@ -30,14 +30,19 @@
// of wxID_HIGHEST here.
#define wxID_HIGHEST 5999
-#define ID_EXPORT_MIDI wxID_HIGHEST + 1
-#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 2
+#define ID_FILE_REVERT_TO_SAVED wxID_HIGHEST + 1
+#define ID_EXPORT_MIDI wxID_HIGHEST + 2
+#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 3
+
#define ID_SETTINGS_METRONOME wxID_HIGHEST + 10
#define ID_SETTINGS_SYNTHESIZER wxID_HIGHEST + 11
#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
+#define ID_SETTINGS_PITCH_PAINTER wxID_HIGHEST + 13
+#define ID_SETTINGS_WAHWAH wxID_HIGHEST + 14
#define ID_EDIT_PASTE_MERGE wxID_HIGHEST + 15
+#define ID_EDIT_MAXIMIZE_VOLUME wxID_HIGHEST + 16
#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
#define ID_AUDIO_SAMPLE_SETTINGS wxID_HIGHEST + 21
@@ -46,49 +51,66 @@
#define ID_AUDIO_SAVE_SAMPLE_SET_AS wxID_HIGHEST + 24
#define ID_AUDIO_NEW_SAMPLE_SET wxID_HIGHEST + 25
-#define ID_TRIM wxID_HIGHEST + 30
-#define ID_QUANTIZE wxID_HIGHEST + 31
-#define ID_SET_CHANNEL wxID_HIGHEST + 32
-#define ID_SHIFT wxID_HIGHEST + 33
-#define ID_SHIFT_LEFT wxID_HIGHEST + 34
-#define ID_SHIFT_RIGHT wxID_HIGHEST + 35
-#define ID_SNAP wxID_HIGHEST + 36
-#define ID_SNAP_8 wxID_HIGHEST + 37
-#define ID_SNAP_8D wxID_HIGHEST + 38
-#define ID_SNAP_16 wxID_HIGHEST + 39
-#define ID_SNAP_16D wxID_HIGHEST + 40
-#define ID_MIXER wxID_HIGHEST + 41
-#define ID_PIANOWIN wxID_HIGHEST + 42
-#define ID_METRONOME_TOGGLE wxID_HIGHEST + 43
-#define ID_VELOCITY wxID_HIGHEST + 44
-#define ID_LENGTH wxID_HIGHEST + 45
-#define ID_MISC_TRACK_MERGE wxID_HIGHEST + 46
-#define ID_MISC_SPLIT_TRACKS wxID_HIGHEST + 47
-#define ID_MISC_METER_CHANGE wxID_HIGHEST + 48
-#define ID_MISC_RESET_MIDI wxID_HIGHEST + 49
-#define ID_MISC_SET_COPYRIGHT wxID_HIGHEST + 50
-#define ID_TRANSPOSE wxID_HIGHEST + 51
-#define ID_CLEANUP wxID_HIGHEST + 52
-#define ID_SEARCH_AND_REPLACE wxID_HIGHEST + 53
+#define ID_EFFECTS_EQUALIZER wxID_HIGHEST + 27
+#define ID_EFFECTS_FILTER wxID_HIGHEST + 28
+#define ID_EFFECTS_DISTORTION wxID_HIGHEST + 29
+#define ID_EFFECTS_REVERB wxID_HIGHEST + 30
+#define ID_EFFECTS_ECHO wxID_HIGHEST + 31
+#define ID_EFFECTS_CHORUS wxID_HIGHEST + 32
+#define ID_EFFECTS_PITCH_SHIFTER wxID_HIGHEST + 33
+#define ID_EFFECTS_STRETCHER wxID_HIGHEST + 34
+#define ID_EFFECTS_REVERSE wxID_HIGHEST + 35
+#define ID_EFFECTS_SYNTH wxID_HIGHEST + 36
-#define ID_PLAY wxID_HIGHEST + 60
-#define ID_PLAY_LOOP wxID_HIGHEST + 61
-#define ID_RECORD wxID_HIGHEST + 62
+#define ID_PAINTERS_VOLUME wxID_HIGHEST + 37
+#define ID_PAINTER_WAHWAH wxID_HIGHEST + 38
+#define ID_PAINTER_PAN wxID_HIGHEST + 39
+#define ID_PAINTER_PITCH wxID_HIGHEST + 40
+#define ID_PAINTER_NONE wxID_HIGHEST + 41
-#define ID_SELECT wxID_HIGHEST + 65
+#define ID_TRIM wxID_HIGHEST + 50
+#define ID_QUANTIZE wxID_HIGHEST + 51
+#define ID_SET_CHANNEL wxID_HIGHEST + 52
+#define ID_SHIFT wxID_HIGHEST + 53
+#define ID_SHIFT_LEFT wxID_HIGHEST + 54
+#define ID_SHIFT_RIGHT wxID_HIGHEST + 55
+#define ID_SNAP wxID_HIGHEST + 56
+#define ID_SNAP_8 wxID_HIGHEST + 57
+#define ID_SNAP_8D wxID_HIGHEST + 58
+#define ID_SNAP_16 wxID_HIGHEST + 59
+#define ID_SNAP_16D wxID_HIGHEST + 60
+#define ID_MIXER wxID_HIGHEST + 61
+#define ID_PIANOWIN wxID_HIGHEST + 62
+#define ID_METRONOME_TOGGLE wxID_HIGHEST + 63
+#define ID_VELOCITY wxID_HIGHEST + 64
+#define ID_LENGTH wxID_HIGHEST + 65
+#define ID_MISC_TRACK_MERGE wxID_HIGHEST + 66
+#define ID_MISC_SPLIT_TRACKS wxID_HIGHEST + 67
+#define ID_MISC_METER_CHANGE wxID_HIGHEST + 68
+#define ID_MISC_RESET_MIDI wxID_HIGHEST + 69
+#define ID_MISC_SET_COPYRIGHT wxID_HIGHEST + 70
+#define ID_TRANSPOSE wxID_HIGHEST + 71
+#define ID_CLEANUP wxID_HIGHEST + 72
+#define ID_SEARCH_AND_REPLACE wxID_HIGHEST + 73
-#define ID_CHANGE_LENGTH wxID_HIGHEST + 70
+#define ID_PLAY wxID_HIGHEST + 80
+#define ID_PLAY_LOOP wxID_HIGHEST + 81
+#define ID_RECORD wxID_HIGHEST + 82
-#define ID_EVENT_DIALOG wxID_HIGHEST + 81
-#define ID_CUT_PASTE_EVENTS wxID_HIGHEST + 82
-#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS wxID_HIGHEST + 83
+#define ID_SELECT wxID_HIGHEST + 85
+#define ID_CHANGE_LENGTH wxID_HIGHEST + 90
+
+#define ID_EVENT_DIALOG wxID_HIGHEST + 91
+#define ID_CUT_PASTE_EVENTS wxID_HIGHEST + 92
+#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS wxID_HIGHEST + 93
+
#define ID_TOOLS_HARMONY_BROWSER wxID_HIGHEST + 95
#define ID_HELP_PIANO_WINDOW wxID_HIGHEST + 100
#define MEN_CLEAR wxID_HIGHEST + 110
-#define MEN_SETTINGS wxID_HIGHEST + 120
+#define ID_VIEW_SETTINGS wxID_HIGHEST + 120
#define IDC_KB_VOLUME wxID_HIGHEST + 1000
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Rhythm.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -496,9 +496,6 @@
// ============================ tRhythmWin ==============================
-#define MEN_CLOSE 1
-#define MEN_LOAD 2
-#define MEN_SAVE 3
#define MEN_HELP 4
#define MEN_ADD 5
#define MEN_DEL 6
@@ -538,8 +535,8 @@
JZToolDef tdefs[] =
{
- { MEN_LOAD, FALSE, open_xpm, "open rhythm file" },
- { MEN_SAVE, FALSE, save_xpm, "save into rhythm file" },
+ { wxID_OPEN, FALSE, open_xpm, "open rhythm file" },
+ { wxID_SAVE, FALSE, save_xpm, "save into rhythm file" },
{ JZToolBar::eToolBarSeparator },
{ MEN_ADD, FALSE, rrgadd_xpm, "add instrument" },
{ MEN_DEL, FALSE, rrgdel_xpm, "remove instrument" },
@@ -562,9 +559,9 @@
wxMenuBar *menu_bar = new wxMenuBar;
wxMenu *menu = new wxMenu;
- menu->Append(MEN_LOAD, "&Load");
- menu->Append(MEN_SAVE, "&Save");
- menu->Append(MEN_CLOSE, "&Close");
+ menu->Append(wxID_OPEN, "&Load");
+ menu->Append(wxID_SAVE, "&Save");
+ menu->Append(wxID_CLOSE, "&Close");
menu_bar->Append(menu, "&File");
menu = new wxMenu;
@@ -756,14 +753,14 @@
Help();
break;
- case MEN_CLOSE:
+ case wxID_CLOSE:
// motif crashes, when Show(FALSE) is called before destructor!
// Show(FALSE);
// DELETE_THIS();
Destroy();
break;
- case MEN_LOAD:
+ case wxID_OPEN:
{
wxString fname = file_selector(
default_filename,
@@ -780,7 +777,7 @@
}
break;
- case MEN_SAVE:
+ case wxID_SAVE:
{
Win2Instrument();
wxString fname = file_selector(
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/SampleWindow.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -45,41 +45,15 @@
//DEBUG#include <iostream>
-#define MEN_LOAD 1
-#define MEN_SAVE 2
-#define MEN_CLOSE 3
-#define MEN_PLAY 4
#define MEN_HELP 5
-#define MEN_SAVEAS 6
-#define MEN_REVERT 7
-#define MEN_VOLUME_MAX 19
-#define MEN_VOLUME_PNT 20
-
#define MEN_SILENCE 21
#define MEN_SILENCE_INS 22
#define MEN_SILENCE_APP 23
#define MEN_SILENCE_OVR 24
-#define MEN_WAHWAH 25
-#define MEN_WAHSETTINGS 26
-#define MEN_PAN_PNT 27
-#define MEN_TRANSP_PNT 28
-#define MEN_TRANSP_SET 29
-
#define MEN_ACCEPT 42
-#define MEN_CANCEL 43
-#define MEN_ECHO 44
-#define MEN_DISTORTION 45
-#define MEN_EQUALIZER 46
-#define MEN_REVERB 47
-#define MEN_SHIFTER 48
-#define MEN_REVERSE 49
-#define MEN_FILTER 51
-#define MEN_CHORUS 52
-#define MEN_STEREO 53
-#define MEN_STRETCHER 54
-#define MEN_SYNTH 55
+
#define MEN_FLIP 56
#define MEN_FLIP_LEFT 57
#define MEN_FLIP_RIGHT 58
@@ -692,22 +666,29 @@
#include "Bitmaps/zoomin.xpm"
#include "Bitmaps/zoomout.xpm"
-static JZToolDef tdefs[] = {
- { MEN_LOAD, FALSE, open_xpm, "open wave file" },
- { MEN_SAVE, FALSE, save_xpm, "save wave file" },
+static JZToolDef tdefs[] =
+{
+ { wxID_OPEN, FALSE, open_xpm, "open wave file" },
+ { wxID_SAVE, FALSE, save_xpm, "save wave file" },
{ JZToolBar::eToolBarSeparator },
{ wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom to selection" },
{ wxID_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out" },
{ MEN_ACCEPT, FALSE, accept_xpm, "accept painting" },
- { MEN_CANCEL, FALSE, cancel_xpm, "cancel painting" },
+ { ID_PAINTER_NONE, FALSE, cancel_xpm, "cancel painting" },
{ JZToolBar::eToolBarSeparator },
- { MEN_PLAY, FALSE, play_xpm, "play sample" },
+ { ID_PLAY, FALSE, play_xpm, "play sample" },
{ MEN_HELP, FALSE, help_xpm, "help" },
{ JZToolBar::eToolBarEnd }
};
-int tSampleWin::geo[4] = { 30, 30, 600, 300 };
+int tSampleWin::geo[4] =
+{
+ 30,
+ 30,
+ 600,
+ 300
+};
tSample *tSampleWin::copy_buffer;
@@ -763,11 +744,11 @@
// Create and populate the File menu.
pMenu = new wxMenu;
- pMenu->Append(MEN_REVERT, "&Revert to Saved");
- pMenu->Append(MEN_LOAD, "&Load...");
+ pMenu->Append(ID_FILE_REVERT_TO_SAVED, "&Revert to Saved");
+ pMenu->Append(wxID_OPEN, "&Load...");
pMenu->Append(wxID_SAVE, "&Save");
pMenu->Append(wxID_SAVEAS, "&Save As...");
- pMenu->Append(MEN_CLOSE, "&Close");
+ pMenu->Append(wxID_CLOSE, "&Close");
pMenuBar->Append(pMenu, "&File");
@@ -786,37 +767,37 @@
pSubMenu->Append(MEN_FLIP_LEFT, "Left");
pSubMenu->Append(MEN_FLIP_RIGHT, "Right");
pMenu->Append(MEN_FLIP, "In&vert Phase", pSubMenu);
- pMenu->Append(MEN_VOLUME_MAX, "&Maximize Volume");
- pMenuBar->Append(pMenu, "&Edit");
+ pMenu->Append(ID_EDIT_MAXIMIZE_VOLUME, "&Maximize Volume");
+ pMenuBar->Append(pMenu, "&Edit");
pMenu = new wxMenu;
- pMenu->Append(MEN_VOLUME_PNT, "&Volume...");
- pMenu->Append(MEN_PAN_PNT, "&Panpot...");
- pMenu->Append(MEN_TRANSP_PNT, "&Pitch...");
- pMenu->Append(MEN_WAHWAH, "&Filter...");
- pMenu->Append(MEN_CANCEL, "&None...");
+ pMenu->Append(ID_PAINTERS_VOLUME, "&Volume...");
+ pMenu->Append(ID_PAINTER_PAN, "&Panpot...");
+ pMenu->Append(ID_PAINTER_PITCH, "&Pitch...");
+ pMenu->Append(ID_PAINTER_WAHWAH, "&Filter...");
+ pMenu->Append(ID_PAINTER_NONE, "&None...");
pMenuBar->Append(pMenu, "&Painters");
pMenu = new wxMenu;
- pMenu->Append(MEN_EQUALIZER, "&Equalizer...");
- pMenu->Append(MEN_FILTER, "&Filter...");
- pMenu->Append(MEN_DISTORTION, "&Distortion...");
- pMenu->Append(MEN_REVERB, "&Reverb...");
- pMenu->Append(MEN_ECHO, "&Echo...");
- pMenu->Append(MEN_CHORUS, "&Chorus...");
- pMenu->Append(MEN_SHIFTER, "&Pitch shifter...");
- pMenu->Append(MEN_STRETCHER, "&Time stretcher...");
- pMenu->Append(MEN_REVERSE, "Re&verse");
- pMenu->Append(MEN_SYNTH, "&Synth...");
+ pMenu->Append(ID_EFFECTS_EQUALIZER, "&Equalizer...");
+ pMenu->Append(ID_EFFECTS_FILTER, "&Filter...");
+ pMenu->Append(ID_EFFECTS_DISTORTION, "&Distortion...");
+ pMenu->Append(ID_EFFECTS_REVERB, "&Reverb...");
+ pMenu->Append(ID_EFFECTS_ECHO, "&Echo...");
+ pMenu->Append(ID_EFFECTS_CHORUS, "&Chorus...");
+ pMenu->Append(ID_EFFECTS_PITCH_SHIFTER, "&Pitch shifter...");
+ pMenu->Append(ID_EFFECTS_STRETCHER, "&Time stretcher...");
+ pMenu->Append(ID_EFFECTS_REVERSE, "Re&verse");
+ pMenu->Append(ID_EFFECTS_SYNTH, "&Synth...");
pMenuBar->Append(pMenu, "&Effects");
pMenu = new wxMenu;
- pMenu->Append(MEN_TRANSP_SET, "&Pitch Painter...");
- pMenu->Append(MEN_WAHSETTINGS, "&Filter Painter...");
+ pMenu->Append(ID_SETTINGS_PITCH_PAINTER, "&Pitch Painter...");
+ pMenu->Append(ID_SETTINGS_WAHWAH, "&Filter Painter...");
// pMenu->Append(wxID_ZOOM_IN, "Zoom &In");
// pMenu->Append(wxID_ZOOM_OUT, "Zoom &Out");
- pMenu->Append(MEN_SETTINGS, "&View Settings...");
- pMenuBar->Append(pMenu, "&Settings");
+ pMenu->Append(ID_VIEW_SETTINGS, "&View Settings...");
+ pMenuBar->Append(pMenu, "&Settings");
SetMenuBar(pMenuBar);
@@ -1012,14 +993,14 @@
}
// Player crashes if data disappear.
- if (id != MEN_PLAY)
+ if (id != ID_PLAY)
{
cnvs->playpos->StopListen();
}
switch (id)
{
- case MEN_EQUALIZER:
+ case ID_EFFECTS_EQUALIZER:
if (equalizer == 0)
equalizer = new tEqualizer(*this);
equalizer->Show(TRUE);
@@ -1032,13 +1013,13 @@
spl.Flip(1);
break;
- case MEN_DISTORTION:
+ case ID_EFFECTS_DISTORTION:
if (distortion == 0)
distortion = new tDistortion(*this);
distortion->Show(TRUE);
break;
- case MEN_REVERB:
+ case ID_EFFECTS_REVERB:
#ifdef OBSOLETE
if (reverb == 0)
{
@@ -1054,7 +1035,7 @@
#endif
break;
- case MEN_REVERSE:
+ case ID_EFFECTS_REVERSE:
{
int fr, to;
if (HaveSelection(fr, to))
@@ -1065,7 +1046,7 @@
}
break;
- case MEN_SHIFTER:
+ case ID_EFFECTS_PITCH_SHIFTER:
#ifdef OBSOLETE
if (shifter == 0)
{
@@ -1080,7 +1061,7 @@
#endif
break;
- case MEN_STRETCHER:
+ case ID_EFFECTS_STRETCHER:
#ifdef OBSOLETE
if (stretcher == 0)
{
@@ -1095,7 +1076,7 @@
#endif
break;
- case MEN_FILTER:
+ case ID_EFFECTS_FILTER:
#ifdef OBSOLETE
if (filter == 0)
{
@@ -1108,7 +1089,7 @@
#endif
break;
- case MEN_SETTINGS:
+ case ID_VIEW_SETTINGS:
#ifdef OBSOLETE
if (settings == 0)
{
@@ -1121,7 +1102,7 @@
#endif
break;
- case MEN_ECHO:
+ case ID_EFFECTS_ECHO:
#ifdef OBSOLETE
if (echo == 0)
{
@@ -1136,7 +1117,7 @@
#endif
break;
- case MEN_CHORUS:
+ case ID_EFFECTS_CHORUS:
#ifdef OBSOLETE
if (chorus == 0)
{
@@ -1151,7 +1132,7 @@
#endif
break;
- case MEN_SYNTH:
+ case ID_EFFECTS_SYNTH:
if (synth == 0)
synth = new tSynthDlg(*this);
synth->Show(TRUE);
@@ -1168,7 +1149,7 @@
}
break;
- case MEN_CANCEL:
+ case ID_PAINTER_NONE:
if (on_accept)
{
delete on_accept;
@@ -1209,22 +1190,22 @@
SetViewPos(0, spl.GetLength());
break;
- case MEN_VOLUME_MAX:
+ case ID_EDIT_MAXIMIZE_VOLUME:
spl.Rescale();
Redraw();
break;
- case MEN_VOLUME_PNT:
+ case ID_PAINTERS_VOLUME:
delete on_accept;
on_accept = new tCommandPainter(*this, vol_command);
break;
- case MEN_WAHWAH:
+ case ID_PAINTER_WAHWAH:
delete on_accept;
on_accept = new tCommandPainter(*this, wah_command);
break;
- case MEN_WAHSETTINGS:
+ case ID_SETTINGS_WAHWAH:
#ifdef OBSOLETE
if (wah_settings == 0)
{
@@ -1237,7 +1218,7 @@
#endif
break;
- case MEN_TRANSP_SET:
+ case ID_SETTINGS_PITCH_PAINTER:
#ifdef OBSOLETE
if (pitch_settings == 0)
{
@@ -1251,7 +1232,7 @@
break;
- case MEN_PAN_PNT:
+ case ID_PAINTER_PAN:
delete on_accept;
on_accept = new tCommandPainter(*this, pan_command);
break;
@@ -1319,39 +1300,46 @@
}
break;
- case MEN_TRANSP_PNT:
+ case ID_PAINTER_PITCH:
delete on_accept;
SetViewPos(0, spl.GetLength());
on_accept = new tCommandPainter(*this, pitch_command);
break;
- case MEN_REVERT:
+ case ID_FILE_REVERT_TO_SAVED:
cnvs->ClearSelection();
if (spl.Load(TRUE))
LoadError(spl);
Redraw();
break;
- case MEN_CLOSE:
+ case wxID_CLOSE:
// DELETE_THIS();
Destroy();
break;
- case MEN_PLAY:
+ case ID_PLAY:
cnvs->Play();
break;
- case MEN_LOAD:
+ case wxID_OPEN:
{
char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(defname, "Load Sample", FALSE, FALSE, "*.wav");
+ wxString fname = file_selector(
+ defname,
+ "Load Sample",
+ FALSE,
+ FALSE,
+ "*.wav");
if (!fname.empty())
{
wxBeginBusyCursor();
cnvs->ClearSelection();
spl.SetFilename(fname);
if (spl.Load(TRUE))
+ {
LoadError(spl);
+ }
spl->RefreshDialogs();
SetTitle(fname);
Redraw();
@@ -1361,14 +1349,19 @@
}
break;
- case MEN_SAVEAS:
+ case wxID_SAVEAS:
{
char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(defname, "Save Sample", TRUE, FALSE, "*.wav");
+ wxString fname = file_selector(
+ defname,
+ "Save Sample",
+ TRUE,
+ FALSE,
+ "*.wav");
if (!fname.empty())
{
spl.SetFilename(fname);
- OnMenuCommand(MEN_SAVE);
+ OnMenuCommand(wxID_SAVE);
spl->RefreshDialogs();
SetTitle(fname);
}
@@ -1376,11 +1369,11 @@
}
break;
- case MEN_SAVE:
+ case wxID_SAVE:
{
if (spl.GetFilename()[0] == 0)
{
- OnMenuCommand(MEN_SAVEAS);
+ OnMenuCommand(wxID_SAVEAS);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-05-10 00:30:50
|
Revision: 779
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=779&view=rev
Author: pstieber
Date: 2010-05-10 00:30:40 +0000 (Mon, 10 May 2010)
Log Message:
-----------
1. Renamed tex2rtf projects and solution files to be less redundant.
2. Added GUI to the tex2rtf_gui.vcproj build configurations to guarantee unique build directories.
Added Paths:
-----------
tex2rtf/VC9/tex2rtf.sln
tex2rtf/VC9/tex2rtf.vcproj
tex2rtf/VC9/tex2rtf_gui.sln
tex2rtf/VC9/tex2rtf_gui.vcproj
Removed Paths:
-------------
tex2rtf/VC9/tex2rtf_tex2rtf.sln
tex2rtf/VC9/tex2rtf_tex2rtf.vcproj
tex2rtf/VC9/tex2rtf_tex2rtf_gui.sln
tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj
Copied: tex2rtf/VC9/tex2rtf.sln (from rev 778, tex2rtf/VC9/tex2rtf_tex2rtf.sln)
===================================================================
--- tex2rtf/VC9/tex2rtf.sln (rev 0)
+++ tex2rtf/VC9/tex2rtf.sln 2010-05-10 00:30:40 UTC (rev 779)
@@ -0,0 +1,110 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tex2rtf", "tex2rtf.vcproj", "{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
+ DLL Unicode Debug|Win32 = DLL Unicode Debug|Win32
+ DLL Unicode Debug|x64 = DLL Unicode Debug|x64
+ DLL Unicode Release|Win32 = DLL Unicode Release|Win32
+ DLL Unicode Release|x64 = DLL Unicode Release|x64
+ DLL Universal Debug|Win32 = DLL Universal Debug|Win32
+ DLL Universal Debug|x64 = DLL Universal Debug|x64
+ DLL Universal Release|Win32 = DLL Universal Release|Win32
+ DLL Universal Release|x64 = DLL Universal Release|x64
+ DLL Universal Unicode Debug|Win32 = DLL Universal Unicode Debug|Win32
+ DLL Universal Unicode Debug|x64 = DLL Universal Unicode Debug|x64
+ DLL Universal Unicode Release|Win32 = DLL Universal Unicode Release|Win32
+ DLL Universal Unicode Release|x64 = DLL Universal Unicode Release|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Unicode Debug|Win32 = Unicode Debug|Win32
+ Unicode Debug|x64 = Unicode Debug|x64
+ Unicode Release|Win32 = Unicode Release|Win32
+ Unicode Release|x64 = Unicode Release|x64
+ Universal Debug|Win32 = Universal Debug|Win32
+ Universal Debug|x64 = Universal Debug|x64
+ Universal Release|Win32 = Universal Release|Win32
+ Universal Release|x64 = Universal Release|x64
+ Universal Unicode Debug|Win32 = Universal Unicode Debug|Win32
+ Universal Unicode Debug|x64 = Universal Unicode Debug|x64
+ Universal Unicode Release|Win32 = Universal Unicode Release|Win32
+ Universal Unicode Release|x64 = Universal Unicode Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|Win32.Build.0 = Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|x64.ActiveCfg = Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|x64.Build.0 = Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|x64.Build.0 = DLL Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|x64.Build.0 = DLL Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|x64.Build.0 = DLL Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|x64.Build.0 = DLL Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|x64.Build.0 = DLL Universal Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|Win32.ActiveCfg = Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|Win32.Build.0 = Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|x64.ActiveCfg = Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|x64.Build.0 = Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|x64.Build.0 = Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|x64.Build.0 = Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|Win32.Build.0 = Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|x64.ActiveCfg = Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|x64.Build.0 = Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|x64.Build.0 = Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|x64.Build.0 = Universal Unicode Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Copied: tex2rtf/VC9/tex2rtf.vcproj (from rev 778, tex2rtf/VC9/tex2rtf_tex2rtf.vcproj)
===================================================================
--- tex2rtf/VC9/tex2rtf.vcproj (rev 0)
+++ tex2rtf/VC9/tex2rtf.vcproj 2010-05-10 00:30:40 UTC (rev 779)
@@ -0,0 +1,3088 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tex2rtf"
+ ProjectGUID="{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}"
+ RootNamespace="tex2rtf"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Universal Unicode Release|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Unicode Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Unicode Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Release|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswuniv;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Universal Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Unicode Release|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Unicode Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64\mswu;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64\mswd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Unicode Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64\mswunivud;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\$(OutDir)\tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Na...
[truncated message content] |
|
From: <pst...@us...> - 2010-05-09 23:05:23
|
Revision: 778
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=778&view=rev
Author: pstieber
Date: 2010-05-09 23:05:17 +0000 (Sun, 09 May 2010)
Log Message:
-----------
1. Added the include files to the projects.
2. Added 64-bit builds.
3. Bumped up the version of wxWidgets used to 2.8.11.
Modified Paths:
--------------
tex2rtf/VC9/tex2rtf_tex2rtf.sln
tex2rtf/VC9/tex2rtf_tex2rtf.vcproj
tex2rtf/VC9/tex2rtf_tex2rtf_gui.sln
tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj
Modified: tex2rtf/VC9/tex2rtf_tex2rtf.sln
===================================================================
--- tex2rtf/VC9/tex2rtf_tex2rtf.sln 2010-05-09 22:57:18 UTC (rev 777)
+++ tex2rtf/VC9/tex2rtf_tex2rtf.sln 2010-05-09 23:05:17 UTC (rev 778)
@@ -6,55 +6,103 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
+ DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
+ DLL Release|x64 = DLL Release|x64
DLL Unicode Debug|Win32 = DLL Unicode Debug|Win32
+ DLL Unicode Debug|x64 = DLL Unicode Debug|x64
DLL Unicode Release|Win32 = DLL Unicode Release|Win32
+ DLL Unicode Release|x64 = DLL Unicode Release|x64
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
+ DLL Universal Debug|x64 = DLL Universal Debug|x64
DLL Universal Release|Win32 = DLL Universal Release|Win32
+ DLL Universal Release|x64 = DLL Universal Release|x64
DLL Universal Unicode Debug|Win32 = DLL Universal Unicode Debug|Win32
+ DLL Universal Unicode Debug|x64 = DLL Universal Unicode Debug|x64
DLL Universal Unicode Release|Win32 = DLL Universal Unicode Release|Win32
+ DLL Universal Unicode Release|x64 = DLL Universal Unicode Release|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
Unicode Debug|Win32 = Unicode Debug|Win32
+ Unicode Debug|x64 = Unicode Debug|x64
Unicode Release|Win32 = Unicode Release|Win32
+ Unicode Release|x64 = Unicode Release|x64
Universal Debug|Win32 = Universal Debug|Win32
+ Universal Debug|x64 = Universal Debug|x64
Universal Release|Win32 = Universal Release|Win32
+ Universal Release|x64 = Universal Release|x64
Universal Unicode Debug|Win32 = Universal Unicode Debug|Win32
+ Universal Unicode Debug|x64 = Universal Unicode Debug|x64
Universal Unicode Release|Win32 = Universal Unicode Release|Win32
+ Universal Unicode Release|x64 = Universal Unicode Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|Win32.ActiveCfg = Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|Win32.Build.0 = Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|x64.ActiveCfg = Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Debug|x64.Build.0 = Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Debug|x64.Build.0 = DLL Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|Win32.Build.0 = DLL Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Release|x64.Build.0 = DLL Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Debug|x64.Build.0 = DLL Unicode Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Unicode Release|x64.Build.0 = DLL Unicode Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Debug|x64.Build.0 = DLL Universal Unicode Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.DLL Universal Unicode Release|x64.Build.0 = DLL Universal Unicode Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|Win32.ActiveCfg = Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|Win32.Build.0 = Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|x64.ActiveCfg = Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Release|x64.Build.0 = Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Unicode Release|x64.Build.0 = Unicode Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Debug|x64.Build.0 = Universal Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|Win32.Build.0 = Universal Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|x64.ActiveCfg = Universal Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Release|x64.Build.0 = Universal Release|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Debug|x64.Build.0 = Universal Unicode Debug|x64
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
{DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|x64
+ {DCA4ADEC-F00C-4288-80A5-582208CCF4BE}.Universal Unicode Release|x64.Build.0 = Universal Unicode Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: tex2rtf/VC9/tex2rtf_tex2rtf.vcproj
===================================================================
--- tex2rtf/VC9/tex2rtf_tex2rtf.vcproj 2010-05-09 22:57:18 UTC (rev 777)
+++ tex2rtf/VC9/tex2rtf_tex2rtf.vcproj 2010-05-09 23:05:17 UTC (rev 778)
@@ -11,16 +11,18 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Universal Unicode Release|Win32"
- OutputDirectory=".\vc_mswunivu"
- IntermediateDirectory=".\vc_mswunivu\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
@@ -39,7 +41,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswunivu/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
@@ -47,16 +49,16 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswunivu\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswunivu\tex2rtf/"
- ObjectFile=".\vc_mswunivu\tex2rtf/"
- ProgramDataBaseFileName="vc_mswunivu\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
/>
@@ -67,7 +69,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -75,11 +77,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswunivu\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- ProgramDatabaseFile=".\vc_mswunivu/tex2rtf.pdb"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -97,7 +99,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswunivu/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -110,11 +112,104 @@
/>
</Configuration>
<Configuration
+ Name="Universal Unicode Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Universal Unicode Debug|Win32"
- OutputDirectory=".\vc_mswunivud"
- IntermediateDirectory=".\vc_mswunivud\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
@@ -133,23 +228,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswunivud/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswunivud\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswunivud\tex2rtf/"
- ObjectFile=".\vc_mswunivud\tex2rtf/"
- ProgramDataBaseFileName="vc_mswunivud\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -161,7 +256,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -169,12 +264,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswunivud\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\vc_mswunivud/tex2rtf.pdb"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -192,7 +287,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswunivud/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -205,11 +300,105 @@
/>
</Configuration>
<Configuration
+ Name="Universal Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Unicode Debug|Win32"
- OutputDirectory=".\vc_mswud"
- IntermediateDirectory=".\vc_mswud\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
@@ -228,23 +417,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswud/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswud\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswud\tex2rtf/"
- ObjectFile=".\vc_mswud\tex2rtf/"
- ProgramDataBaseFileName="vc_mswud\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -256,7 +445,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -264,12 +453,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswud\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\vc_mswud/tex2rtf.pdb"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -287,7 +476,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswud/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -300,11 +489,105 @@
/>
</Configuration>
<Configuration
+ Name="Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory=".\vc_msw"
- IntermediateDirectory=".\vc_msw\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -322,7 +605,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_msw/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
@@ -330,16 +613,16 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_msw\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_msw\tex2rtf/"
- ObjectFile=".\vc_msw\tex2rtf/"
- ProgramDataBaseFileName="vc_msw\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
/>
@@ -350,7 +633,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\msw;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -358,11 +641,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_msw\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib"
- ProgramDatabaseFile=".\vc_msw/tex2rtf.pdb"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -380,7 +663,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_msw/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -393,11 +676,103 @@
/>
</Configuration>
<Configuration
+ Name="Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Universal Release|Win32"
- OutputDirectory=".\vc_mswuniv"
- IntermediateDirectory=".\vc_mswuniv\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -415,7 +790,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswuniv/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
@@ -423,16 +798,16 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswuniv,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswuniv\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswuniv\tex2rtf/"
- ObjectFile=".\vc_mswuniv\tex2rtf/"
- ProgramDataBaseFileName="vc_mswuniv\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
/>
@@ -443,7 +818,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswuniv;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -451,11 +826,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswuniv\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
- ProgramDatabaseFile=".\vc_mswuniv/tex2rtf.pdb"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -473,7 +848,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswuniv/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -486,11 +861,103 @@
/>
</Configuration>
<Configuration
+ Name="Universal Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswuniv";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswuniv;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Universal Debug|Win32"
- OutputDirectory=".\vc_mswunivd"
- IntermediateDirectory=".\vc_mswunivd\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -508,23 +975,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswunivd/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivd,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswunivd\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswunivd\tex2rtf/"
- ObjectFile=".\vc_mswunivd\tex2rtf/"
- ProgramDataBaseFileName="vc_mswunivd\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -536,7 +1003,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivd;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -544,12 +1011,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswunivd\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\vc_mswunivd/tex2rtf.pdb"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -567,7 +1034,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswunivd/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -580,11 +1047,104 @@
/>
</Configuration>
<Configuration
+ Name="Universal Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswunivd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64\mswunivd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="DLL Unicode Release|Win32"
- OutputDirectory=".\vc_mswudll"
- IntermediateDirectory=".\vc_mswudll\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
@@ -603,7 +1163,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswudll/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
@@ -611,16 +1171,16 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswudll\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswudll\tex2rtf/"
- ObjectFile=".\vc_mswudll\tex2rtf/"
- ProgramDataBaseFileName="vc_mswudll\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
/>
@@ -631,7 +1191,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -639,11 +1199,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswudll\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
- ProgramDatabaseFile=".\vc_mswudll/tex2rtf.pdb"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -661,7 +1221,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswudll/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -674,11 +1234,104 @@
/>
</Configuration>
<Configuration
+ Name="DLL Unicode Release|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswu";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64\mswu;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64""
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="DLL Debug|Win32"
- OutputDirectory=".\vc_mswddll"
- IntermediateDirectory=".\vc_mswddll\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -696,23 +1349,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswddll/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswd,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswddll\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswddll\tex2rtf/"
- ObjectFile=".\vc_mswddll\tex2rtf/"
- ProgramDataBaseFileName="vc_mswddll\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -724,7 +1377,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswd;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -732,12 +1385,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswddll\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\vc_mswddll/tex2rtf.pdb"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -755,7 +1408,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswddll/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -768,11 +1421,104 @@
/>
</Configuration>
<Configuration
+ Name="DLL Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64\mswd;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll_x64""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="DLL Universal Unicode Debug|Win32"
- OutputDirectory=".\vc_mswunivuddll"
- IntermediateDirectory=".\vc_mswunivuddll\tex2rtf"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
@@ -791,23 +1537,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\vc_mswunivuddll/tex2rtf_tex2rtf.tlb"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud,.\..\..\..\include,."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\vc_mswunivuddll\tex2rtf/tex2rtf_tex2rtf.pch"
- AssemblerListingLocation=".\vc_mswunivuddll\tex2rtf/"
- ObjectFile=".\vc_mswunivuddll\tex2rtf/"
- ProgramDataBaseFileName="vc_mswunivuddll\tex2rtf.pdb"
+ PrecompiledHeaderFile=".\$(OutDir)\tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\$(OutDir)\"
+ ObjectFile=".\$(OutDir)\"
+ ProgramDataBaseFileName=".\$(OutDir)\tex2rtf.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -819,7 +1565,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud;"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -827,12 +1573,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
- OutputFile="vc_mswunivuddll\tex2rtf.exe"
+ OutputFile=".\$(OutDir)\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\vc_mswunivuddll/tex2rtf.pdb"
+ ProgramDatabaseFile=".\$(OutDir)\tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -850,7 +1596,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswunivuddll/tex2rtf_tex2rtf.bsc"
+ OutputFile=".\$(OutDir)\tex2rtf_tex2rtf.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -863,11 +1609,105 @@
/>
</Configuration>
<Configuration
+ Name="DLL Universal Unicode Debug|x64"
+ OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\$(OutDir)\tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_dll\mswunivud";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";."
+ PreprocessorDefinitions...
[truncated message content] |
|
From: <pst...@us...> - 2010-05-09 22:57:25
|
Revision: 777
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=777&view=rev
Author: pstieber
Date: 2010-05-09 22:57:18 +0000 (Sun, 09 May 2010)
Log Message:
-----------
Fixed size_t vs. int warnings in 64-bit VC9 builds.
Modified Paths:
--------------
tex2rtf/src/htmlutil.cpp
tex2rtf/src/rtfutils.cpp
tex2rtf/src/table.cpp
tex2rtf/src/tex2any.cpp
tex2rtf/src/tex2any.h
tex2rtf/src/texutils.cpp
tex2rtf/src/xlputils.cpp
Modified: tex2rtf/src/htmlutil.cpp
===================================================================
--- tex2rtf/src/htmlutil.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/htmlutil.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -259,10 +259,10 @@
void ProcessText2HTML(TexChunk *chunk)
{
bool changed = false;
- int ptr = 0;
- int i = 0;
+ size_t ptr = 0;
+ size_t i = 0;
wxChar ch = 1;
- int len = wxStrlen(chunk->value);
+ size_t len = wxStrlen(chunk->value);
while (ch != 0)
{
ch = chunk->value[i];
Modified: tex2rtf/src/rtfutils.cpp
===================================================================
--- tex2rtf/src/rtfutils.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/rtfutils.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -312,15 +312,24 @@
void SplitIndexEntry(const wxChar *entry, wxChar *buf1, wxChar *buf2)
{
- int len = wxStrlen(entry); int i = 0;
+ size_t len = wxStrlen(entry);
+ size_t i = 0;
while ((i < len) && entry[i] != '!')
- { buf1[i] = entry[i]; i ++; }
+ {
+ buf1[i] = entry[i];
+ ++i;
+ }
buf1[i] = 0; buf2[0] = 0; int j = 0;
if (entry[i] == '!')
{
- i ++;
- while (i < len) { buf2[j] = entry[i]; i ++; j++; }
+ ++i;
+ while (i < len)
+ {
+ buf2[j] = entry[i];
+ ++i;
+ ++j;
+ }
buf2[j] = 0;
}
}
@@ -590,10 +599,10 @@
void ProcessText2RTF(TexChunk *chunk)
{
bool changed = false;
- int ptr = 0;
- int i = 0;
+ size_t ptr = 0;
+ size_t i = 0;
wxChar ch = 1;
- int len = wxStrlen(chunk->value);
+ size_t len = wxStrlen(chunk->value);
while (ch != 0)
{
ch = chunk->value[i];
@@ -761,11 +770,11 @@
wxChar *GetBrowseString(void)
{
wxChar buf[10];
- browseId ++;
+ ++browseId;
wxSnprintf(buf, sizeof(buf), _T("%ld"), browseId);
- int noZeroes = 5-wxStrlen(buf);
+ size_t noZeroes = 5 - wxStrlen(buf);
wxStrcpy(browseBuf, _T("browse"));
- for (int i = 0; i < noZeroes; i++)
+ for (size_t i = 0; i < noZeroes; i++)
wxStrcat(browseBuf, _T("0"));
wxStrcat(browseBuf, buf);
return browseBuf;
Modified: tex2rtf/src/table.cpp
===================================================================
--- tex2rtf/src/table.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/table.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -57,8 +57,8 @@
bool ParseTableArgument(wxChar *value)
{
noColumns = 0;
- int i = 0;
- int len = wxStrlen(value);
+ size_t i = 0;
+ size_t len = wxStrlen(value);
bool isBorder = false;
while (i < len)
{
Modified: tex2rtf/src/tex2any.cpp
===================================================================
--- tex2rtf/src/tex2any.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/tex2any.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -250,11 +250,11 @@
void TexOutput(const wxChar *s, bool ordinaryText)
{
- int len = wxStrlen(s);
+ size_t len = wxStrlen(s);
// Update current column, but only if we're guaranteed to
// be ordinary text (not mark-up stuff)
- int i;
+ size_t i;
if (ordinaryText)
for (i = 0; i < len; i++)
{
@@ -299,98 +299,106 @@
}
}
-TexMacroDef *MatchMacro(wxChar *buffer, int *pos, wxChar **env, bool *parseToBrace)
+TexMacroDef *MatchMacro(
+ wxChar *buffer,
+ size_t *pos,
+ wxChar **env,
+ bool *parseToBrace)
{
- *parseToBrace = true;
- int i = (*pos);
- TexMacroDef *def = NULL;
- wxChar macroBuf[40];
+ *parseToBrace = true;
+ size_t i = *pos;
+ TexMacroDef *def = NULL;
+ wxChar macroBuf[40];
- // First, try to find begin{thing}
- if (wxStrncmp(buffer+i, _T("begin{"), 6) == 0)
+ // First, try to find begin{thing}
+ if (wxStrncmp(buffer+i, _T("begin{"), 6) == 0)
+ {
+ i += 6;
+
+ size_t j = i;
+ while ((isalpha(buffer[j]) || buffer[j] == '*') && ((j - i) < 39))
{
- i += 6;
+ macroBuf[j-i] = buffer[j];
+ ++j;
+ }
+ macroBuf[j-i] = 0;
+ def = (TexMacroDef *)MacroDefs.Get(macroBuf);
- int j = i;
- while ((isalpha(buffer[j]) || buffer[j] == '*') && ((j - i) < 39))
- {
- macroBuf[j-i] = buffer[j];
- j ++;
- }
- macroBuf[j-i] = 0;
- def = (TexMacroDef *)MacroDefs.Get(macroBuf);
-
- if (def)
- {
- *pos = j + 1; // BUGBUG Should this be + 1???
- *env = def->name;
- ForbidWarning(def);
- return def;
- }
- else
- {
- return NULL;
- }
+ if (def)
+ {
+ *pos = j + 1; // BUGBUG Should this be + 1???
+ *env = def->name;
+ ForbidWarning(def);
+ return def;
}
+ else
+ {
+ return NULL;
+ }
+ }
- // Failed, so try to find macro from definition list
- int j = i;
+ // Failed, so try to find macro from definition list
+ size_t j = i;
- // First try getting a one-character macro, but ONLY
- // if these TWO characters are not both alphabetical (could
- // be a longer macro)
- if (!(isalpha(buffer[i]) && isalpha(buffer[i+1])))
- {
- macroBuf[0] = buffer[i];
- macroBuf[1] = 0;
+ // First try getting a one-character macro, but ONLY
+ // if these TWO characters are not both alphabetical (could
+ // be a longer macro)
+ if (!(isalpha(buffer[i]) && isalpha(buffer[i+1])))
+ {
+ macroBuf[0] = buffer[i];
+ macroBuf[1] = 0;
- def = (TexMacroDef *)MacroDefs.Get(macroBuf);
- if (def) j ++;
- }
+ def = (TexMacroDef *)MacroDefs.Get(macroBuf);
+ if (def)
+ ++j;
+ }
- if (!def)
+ if (!def)
+ {
+ while ((isalpha(buffer[j]) || buffer[j] == '*') && ((j - i) < 39))
{
- while ((isalpha(buffer[j]) || buffer[j] == '*') && ((j - i) < 39))
- {
- macroBuf[j-i] = buffer[j];
- j ++;
- }
- macroBuf[j-i] = 0;
- def = (TexMacroDef *)MacroDefs.Get(macroBuf);
+ macroBuf[j-i] = buffer[j];
+ ++j;
}
+ macroBuf[j-i] = 0;
+ def = (TexMacroDef *)MacroDefs.Get(macroBuf);
+ }
- if (def)
+ if (def)
+ {
+ i = j;
+
+ // We want to check whether this is a space-consuming macro
+ // (e.g. {\bf word})
+ // No brace, e.g. \input thing.tex instead of \input{thing};
+ // or a numeric argument, such as \parindent0pt
+ if (
+ (def->no_args > 0) &&
+ ((buffer[i] == 32) || (buffer[i] == '=') || (isdigit(buffer[i]))))
{
- i = j;
+ if ((buffer[i] == 32) || (buffer[i] == '='))
+ ++i;
- // We want to check whether this is a space-consuming macro
- // (e.g. {\bf word})
- // No brace, e.g. \input thing.tex instead of \input{thing};
- // or a numeric argument, such as \parindent0pt
- if ((def->no_args > 0) && ((buffer[i] == 32) || (buffer[i] == '=') || (isdigit(buffer[i]))))
- {
- if ((buffer[i] == 32) || (buffer[i] == '='))
- i ++;
-
- *parseToBrace = false;
- }
- *pos = i;
- ForbidWarning(def);
- return def;
+ *parseToBrace = false;
}
- return NULL;
+ *pos = i;
+ ForbidWarning(def);
+ return def;
+ }
+ return NULL;
}
-void EatWhiteSpace(wxChar *buffer, int *pos)
+void EatWhiteSpace(wxChar *buffer, size_t *pos)
{
- int len = wxStrlen(buffer);
- int j = *pos;
+ size_t len = wxStrlen(buffer);
+ size_t j = *pos;
bool keepGoing = true;
bool moreLines = true;
- while ((j < len) && keepGoing &&
- (buffer[j] == 10 || buffer[j] == 13 || buffer[j] == ' ' || buffer[j] == 9))
+ while (
+ (j < len) && keepGoing &&
+ (buffer[j] == 10 || buffer[j] == 13 || buffer[j] == ' ' || buffer[j] == 9))
{
- j ++;
+ ++j;
if (j >= len)
{
if (moreLines)
@@ -400,15 +408,17 @@
j = 0;
}
else
+ {
keepGoing = false;
+ }
}
}
*pos = j;
}
-bool FindEndEnvironment(wxChar *buffer, int *pos, wxChar *env)
+bool FindEndEnvironment(wxChar *buffer, size_t *pos, wxChar *env)
{
- int i = (*pos);
+ size_t i = *pos;
// Try to find end{thing}
if ((wxStrncmp(buffer+i, _T("end{"), 4) == 0) &&
@@ -867,7 +877,7 @@
*
*/
-bool ParseNewCommand(wxChar *buffer, int *pos)
+bool ParseNewCommand(wxChar *buffer, size_t *pos)
{
if ((wxStrncmp((buffer+(*pos)), _T("newcommand"), 10) == 0) ||
(wxStrncmp((buffer+(*pos)), _T("renewcommand"), 12) == 0))
@@ -971,15 +981,23 @@
* e.g. in {\bf an argument} as opposed to \vskip 30pt
*
*/
-int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxChar *environment, bool parseToBrace, TexChunk *customMacroArgs)
+size_t ParseArg(
+ TexChunk *thisArg,
+ wxList& children,
+ wxChar *buffer,
+ size_t pos,
+ wxChar *environment,
+ bool parseToBrace,
+ TexChunk *customMacroArgs)
{
Tex2RTFYield();
- if (stopRunning) return pos;
+ if (stopRunning)
+ return pos;
bool eof = false;
BigBuffer[0] = 0;
- int buf_ptr = 0;
- int len;
+ size_t buf_ptr = 0;
+ size_t len;
/*
@@ -1225,18 +1243,18 @@
wxChar ch = buffer[pos];
pos ++;
// Now at start of verbatim text
- int j = pos;
+ size_t j = pos;
while ((buffer[pos] != ch) && buffer[pos] != 0)
pos ++;
wxChar *val = new wxChar[pos - j + 1];
- int i;
+ size_t i;
for (i = j; i < pos; i++)
{
- val[i-j] = buffer[i];
+ val[i - j] = buffer[i];
}
- val[i-j] = 0;
+ val[i - j] = 0;
- pos ++;
+ ++pos;
TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO);
chunk->no_args = 1;
@@ -1282,13 +1300,15 @@
pos ++;
}
- pos = ParseMacroBody(def->name,
- chunk, chunk->no_args,
- buffer,
- pos,
- env,
- tmpParseToBrace,
- customMacroArgs);
+ pos = ParseMacroBody(
+ def->name,
+ chunk,
+ chunk->no_args,
+ buffer,
+ pos,
+ env,
+ tmpParseToBrace,
+ customMacroArgs);
// If custom macro, parse the body substituting the above found args.
if (customMacro)
@@ -1343,8 +1363,15 @@
if (!customMacro)
children.Append((wxObject *)chunk);
- pos = ParseMacroBody(def->name, chunk, chunk->no_args,
- buffer, pos, NULL, true, customMacroArgs);
+ pos = ParseMacroBody(
+ def->name,
+ chunk,
+ chunk->no_args,
+ buffer,
+ pos,
+ NULL,
+ true,
+ customMacroArgs);
// If custom macro, parse the body substituting the above found args.
if (customMacro)
@@ -1399,7 +1426,14 @@
arg->argn = 1;
arg->macroId = chunk->macroId;
- pos = ParseArg(arg, arg->children, buffer, pos, NULL, true, customMacroArgs);
+ pos = ParseArg(
+ arg,
+ arg->children,
+ buffer,
+ pos,
+ NULL,
+ true,
+ customMacroArgs);
}
break;
}
@@ -1562,13 +1596,20 @@
*
*/
-int ParseMacroBody(const wxChar *WXUNUSED(macro_name), TexChunk *parent,
- int no_args, wxChar *buffer, int pos,
- wxChar *environment, bool parseToBrace,
- TexChunk *customMacroArgs)
+size_t ParseMacroBody(
+ const wxChar *WXUNUSED(macro_name),
+ TexChunk *parent,
+ int no_args,
+ wxChar
+ *buffer,
+ size_t pos,
+ wxChar *environment,
+ bool parseToBrace,
+ TexChunk *customMacroArgs)
{
Tex2RTFYield();
- if (stopRunning) return pos;
+ if (stopRunning)
+ return pos;
// Check for a first optional argument
if (buffer[pos] == ' ' && buffer[pos+1] == '[')
@@ -1643,7 +1684,14 @@
}
arg->optional = isOptional;
- pos = ParseArg(arg, arg->children, buffer, pos, actualEnv, parseToBrace, customMacroArgs);
+ pos = ParseArg(
+ arg,
+ arg->children,
+ buffer,
+ pos,
+ actualEnv,
+ parseToBrace,
+ customMacroArgs);
// If we've encountered an OPTIONAL argument, go another time around
// the loop, because we've got more than we thought.
@@ -3224,27 +3272,30 @@
// from a normal 'ref' reference
wxChar buf[150];
wxStrcpy(buf, texRef->sectionNumber);
- int len = wxStrlen(buf);
- int i = 0;
+ size_t len = wxStrlen(buf);
+ size_t i = 0;
if (wxStrcmp(buf, _T("??")) != 0)
{
while (i < len)
{
if (buf[i] == ' ')
{
- i ++;
+ ++i;
break;
}
- else i ++;
+ else
+ {
+ ++i;
+ }
}
}
TexOutput(texRef->sectionNumber + i, true);
}
else
{
- wxString informBuf;
- informBuf.Printf(_T("Warning: unresolved reference '%s'"), refName);
- OnInform((wxChar *)informBuf.c_str());
+ wxString informBuf;
+ informBuf.Printf(_T("Warning: unresolved reference '%s'"), refName);
+ OnInform((wxChar *)informBuf.c_str());
}
}
else TexOutput(_T("??"), true);
@@ -3385,7 +3436,7 @@
if (start && !IsArgOptional())
{
wxChar *citeKeys = GetArgData();
- int pos = 0;
+ size_t pos = 0;
wxChar *citeKey = ParseMultifieldString(citeKeys, &pos);
while (citeKey)
{
@@ -3521,7 +3572,7 @@
// Read in the .bib file, resolve all known references, write out the RTF.
wxChar *allFiles = GetArgData();
- int pos = 0;
+ size_t pos = 0;
wxChar *bibFile = ParseMultifieldString(allFiles, &pos);
while (bibFile)
{
Modified: tex2rtf/src/tex2any.h
===================================================================
--- tex2rtf/src/tex2any.h 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/tex2any.h 2010-05-09 22:57:18 UTC (rev 777)
@@ -151,10 +151,23 @@
bool read_a_line(wxChar *buf);
bool TexLoadFile(const wxString& filename);
-int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos,
- wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);
-int ParseMacroBody(const wxChar *macro_name, TexChunk *parent, int no_args,
- wxChar *buffer, int pos, wxChar *environment = NULL, bool parseArgToBrace = true, TexChunk *customMacroArgs = NULL);
+size_t ParseArg(
+ TexChunk *thisArg,
+ wxList& children,
+ wxChar *buffer,
+ size_t pos,
+ wxChar *environment = NULL,
+ bool parseArgToBrace = true,
+ TexChunk *customMacroArgs = NULL);
+size_t ParseMacroBody(
+ const wxChar *macro_name,
+ TexChunk *parent,
+ int no_args,
+ wxChar *buffer,
+ size_t pos,
+ wxChar *environment = NULL,
+ bool parseArgToBrace = true,
+ TexChunk *customMacroArgs = NULL);
void TraverseDocument(void);
void TraverseFromChunk(TexChunk *chunk, wxList::compatibility_iterator* thisNode = NULL, bool childrenOnly = false);
#define TraverseChildrenFromChunk(arg) TraverseFromChunk(arg, NULL, true)
@@ -540,7 +553,7 @@
bool ReadCustomMacros(const wxString& filename);
void ShowCustomMacros(void);
CustomMacro *FindCustomMacro(wxChar *name);
-wxChar *ParseMultifieldString(wxChar *s, int *pos);
+wxChar *ParseMultifieldString(wxChar *s, size_t *pos);
/*
* Colour table stuff
Modified: tex2rtf/src/texutils.cpp
===================================================================
--- tex2rtf/src/texutils.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/texutils.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -230,9 +230,9 @@
{
float conversionFactor = 1.0;
float unitValue = 0.0;
- int len = wxStrlen(unitArg);
+ size_t len = wxStrlen(unitArg);
// Get rid of any accidentally embedded commands
- for (int i = 0; i < len; i++)
+ for (size_t i = 0; i < len; i++)
if (unitArg[i] == '\\')
unitArg[i] = 0;
len = wxStrlen(unitArg);
@@ -268,8 +268,8 @@
void StripExtension(wxChar *buffer)
{
- int len = wxStrlen(buffer);
- int i = len-1;
+ size_t len = wxStrlen(buffer);
+ size_t i = len-1;
while (i > 0)
{
if (buffer[i] == '.')
@@ -277,7 +277,7 @@
buffer[i] = 0;
break;
}
- i --;
+ --i;
}
}
@@ -1583,13 +1583,13 @@
}
// Parse a string into several comma-separated fields
-wxChar *ParseMultifieldString(wxChar *allFields, int *pos)
+wxChar *ParseMultifieldString(wxChar *allFields, size_t *pos)
{
static wxChar buffer[300];
int i = 0;
- int fieldIndex = *pos;
- int len = wxStrlen(allFields);
- int oldPos = *pos;
+ size_t fieldIndex = *pos;
+ size_t len = wxStrlen(allFields);
+ size_t oldPos = *pos;
bool keepGoing = true;
while ((fieldIndex <= len) && keepGoing)
{
@@ -1616,7 +1616,7 @@
}
}
buffer[i] = 0;
- if (oldPos == (*pos))
+ if (oldPos == *pos)
*pos = len + 1;
if (i == 0)
@@ -1813,8 +1813,8 @@
wxChar* ConvertCase(const wxChar* pString)
{
static wxChar buf[256];
- int len = wxStrlen(pString);
- int i;
+ size_t len = wxStrlen(pString);
+ size_t i;
if (upperCaseNames)
{
for (i = 0; i < len; i ++)
Modified: tex2rtf/src/xlputils.cpp
===================================================================
--- tex2rtf/src/xlputils.cpp 2010-04-28 23:36:06 UTC (rev 776)
+++ tex2rtf/src/xlputils.cpp 2010-05-09 22:57:18 UTC (rev 777)
@@ -742,7 +742,7 @@
// Count the number of columns
noColumns = 0;
- int len = wxStrlen(alignString);
+ size_t len = wxStrlen(alignString);
if (len > 0)
{
if (alignString[0] == '|')
@@ -751,7 +751,7 @@
tableVerticalLineRight = true;
}
- for (int i = 0; i < len; i++)
+ for (size_t i = 0; i < len; i++)
if (isalpha(alignString[i]))
noColumns ++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 23:36:11
|
Revision: 776
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=776&view=rev
Author: pstieber
Date: 2010-04-28 23:36:06 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Removed an unused directory.
Removed Paths:
-------------
trunk/jazz/src/gui/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 23:14:14
|
Revision: 775
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=775&view=rev
Author: pstieber
Date: 2010-04-28 23:14:07 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Massive curly bracket style update.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.h
trunk/jazz/src/AlsaPlayer.h
trunk/jazz/src/Command.cpp
trunk/jazz/src/ControlEdit.h
trunk/jazz/src/DeprecatedWx/prop.cpp
trunk/jazz/src/DeprecatedWx/prop.h
trunk/jazz/src/DeprecatedWx/propform.h
trunk/jazz/src/DeprecatedWx/proplist.h
trunk/jazz/src/Dialogs/copyright.cpp
trunk/jazz/src/Dialogs/midiThruDialog.cpp
trunk/jazz/src/DynamicArray.h
trunk/jazz/src/Events.h
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/HarmonyP.cpp
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/Random.h
trunk/jazz/src/ResourceDialog.h
trunk/jazz/src/Rhythm.h
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleCommand.h
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SampleDialog.h
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/SampleWindow.h
trunk/jazz/src/Signal2.h
trunk/jazz/src/Synth.cpp
trunk/jazz/src/Synth.h
trunk/jazz/src/Track.h
trunk/jazz/src/gui/trackwinEnum.h
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.h
Modified: trunk/jazz/src/AlsaDriver.h
===================================================================
--- trunk/jazz/src/AlsaDriver.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/AlsaDriver.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -47,8 +47,14 @@
{
return mInstalled && tAlsaPlayer::IsInstalled();
}
- virtual int GetAudioEnabled() const { return audio_enabled; }
- virtual void SetAudioEnabled(int x) { audio_enabled = x; }
+ virtual int GetAudioEnabled() const
+ {
+ return audio_enabled;
+ }
+ virtual void SetAudioEnabled(int x)
+ {
+ audio_enabled = x;
+ }
virtual void ListenAudio(int key, int start_stop_mode = 1);
virtual void ListenAudio(tSample &spl, long fr_smpl, long to_smpl);
virtual bool IsListening() const
Modified: trunk/jazz/src/AlsaPlayer.h
===================================================================
--- trunk/jazz/src/AlsaPlayer.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/AlsaPlayer.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -52,8 +52,14 @@
void Notify();
bool IsInstalled();
int OutEvent(JZEvent *e, int now);
- int OutEvent(JZEvent *e) { return OutEvent(e, 0); }
- void OutNow(JZEvent *e) { OutEvent(e, 1); }
+ int OutEvent(JZEvent *e)
+ {
+ return OutEvent(e, 0);
+ }
+ void OutNow(JZEvent *e)
+ {
+ OutEvent(e, 1);
+ }
void OutNow(tParam *r);
void OutBreak();
void OutBreak(long BreakOver);
@@ -61,11 +67,26 @@
void StopPlay();
long GetRealTimeClock();
virtual void SetSoftThru(int on, int idev, int odev);
- virtual int SupportsMultipleDevices() { return 1; }
- virtual tDeviceList & GetOutputDevices() { return oaddr; }
- virtual tDeviceList & GetInputDevices() { return iaddr; }
- virtual int GetThruInputDevice() { return ithru; }
- virtual int GetThruOutputDevice() { return othru; }
+ virtual int SupportsMultipleDevices()
+ {
+ return 1;
+ }
+ virtual tDeviceList & GetOutputDevices()
+ {
+ return oaddr;
+ }
+ virtual tDeviceList & GetInputDevices()
+ {
+ return iaddr;
+ }
+ virtual int GetThruInputDevice()
+ {
+ return ithru;
+ }
+ virtual int GetThruOutputDevice()
+ {
+ return othru;
+ }
int FindMidiDevice();
protected:
@@ -94,7 +115,11 @@
unsigned DeviceCapabilities);
int select_list(tAlsaDeviceList &list, const char *title, int def_device);
int start_timer(long clock);
- int write(snd_seq_event_t *ev) { return write(ev, 0); } // 0 == ok
+ int write(snd_seq_event_t *ev)
+ {
+ // 0 == ok
+ return write(ev, 0);
+ }
int write(snd_seq_event_t *ev, int now); // 0 == ok
void set_event_header(snd_seq_event_t *ev, long clock, int type);
void set_event_header(snd_seq_event_t *ev, long clock, int len, void *ptr);
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Command.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -1099,7 +1099,7 @@
JZKeyOnEvent* pKeyOn = (JZKeyOnEvent *)pEvent->Copy();
int n_th = 0;
- // the n'th key from bottom
+ // the n'th key from bottom
for (i = 0; i <= pKeyOn->GetKey(); i++)
{
n_th += Keys[i];
Modified: trunk/jazz/src/ControlEdit.h
===================================================================
--- trunk/jazz/src/ControlEdit.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/ControlEdit.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -98,7 +98,10 @@
virtual int GetValue(JZEvent *e) = 0;
- virtual JZEvent* NewEvent(long clock, int val) { return 0; }
+ virtual JZEvent* NewEvent(long clock, int val)
+ {
+ return 0;
+ }
virtual void OnApply();
virtual void OnRevert();
Modified: trunk/jazz/src/DeprecatedWx/prop.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/prop.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/DeprecatedWx/prop.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -1226,20 +1226,24 @@
wxPropertyValidator::~wxPropertyValidator(void)
{}
-bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) {
+bool wxPropertyValidator::StringToFloat (wxChar *s, float *number)
+{
double num;
bool ok = StringToDouble (s, &num);
*number = (float) num;
return ok;
}
-bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) {
+bool wxPropertyValidator::StringToDouble (wxChar *s, double *number)
+{
bool ok = true;
wxChar *value_ptr;
*number = wxStrtod (s, &value_ptr);
- if (value_ptr) {
+ if (value_ptr)
+ {
int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
+ for (int i = 0; i < len; i++)
+ {
ok = (wxIsspace (value_ptr[i]) != 0);
if (!ok) return false;
}
@@ -1247,20 +1251,24 @@
return ok;
}
-bool wxPropertyValidator::StringToInt (wxChar *s, int *number) {
+bool wxPropertyValidator::StringToInt (wxChar *s, int *number)
+{
long num;
bool ok = StringToLong (s, &num);
*number = (int) num;
return ok;
}
-bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
+bool wxPropertyValidator::StringToLong (wxChar *s, long *number)
+{
bool ok = true;
wxChar *value_ptr;
*number = wxStrtol (s, &value_ptr, 10);
- if (value_ptr) {
+ if (value_ptr)
+ {
int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
+ for (int i = 0; i < len; i++)
+ {
ok = (wxIsspace (value_ptr[i]) != 0);
if (!ok) return false;
}
@@ -1268,26 +1276,30 @@
return ok;
}
-wxChar *wxPropertyValidator::FloatToString (float number) {
+wxChar *wxPropertyValidator::FloatToString (float number)
+{
static wxChar buf[20];
wxSnprintf (buf, 20, wxT("%.6g"), number);
return buf;
}
-wxChar *wxPropertyValidator::DoubleToString (double number) {
+wxChar *wxPropertyValidator::DoubleToString (double number)
+{
static wxChar buf[20];
wxSnprintf (buf, 20, wxT("%.6g"), number);
return buf;
}
-wxChar *wxPropertyValidator::IntToString (int number) {
+wxChar *wxPropertyValidator::IntToString (int number)
+{
static wxChar buf[20];
wxSprintf (buf, wxT("%d"), number);
return buf;
}
-wxChar *wxPropertyValidator::LongToString (long number) {
+wxChar *wxPropertyValidator::LongToString (long number)
+{
static wxChar buf[20];
wxSprintf (buf, wxT("%ld"), number);
Modified: trunk/jazz/src/DeprecatedWx/prop.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/prop.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/DeprecatedWx/prop.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -112,15 +112,22 @@
~wxPropertyView();
// Associates and shows the view
- virtual void ShowView(wxPropertySheet *WXUNUSED(propertySheet), wxWindow *WXUNUSED(panel)) {}
+ virtual void ShowView(wxPropertySheet *WXUNUSED(propertySheet), wxWindow *WXUNUSED(panel))
+ {
+ }
// Update this view of the viewed object, called e.g. by
// the object itself.
- virtual bool OnUpdateView() {return false;};
+ virtual bool OnUpdateView()
+ {
+ return false;
+ }
// Override this to do something as soon as the property changed,
// if the view and validators support it.
- virtual void OnPropertyChanged(wxProperty *WXUNUSED(property)) {}
+ virtual void OnPropertyChanged(wxProperty *WXUNUSED(property))
+ {
+ }
virtual void AddRegistry(wxPropertyValidatorRegistry *registry);
inline
@@ -175,9 +182,18 @@
wxPropertyValidator(long flags = 0);
~wxPropertyValidator();
- inline long GetFlags() const { return m_validatorFlags; }
- inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; }
- inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; }
+ inline long GetFlags() const
+ {
+ return m_validatorFlags;
+ }
+ inline void SetValidatorProperty(wxProperty *prop)
+ {
+ m_validatorProperty = prop;
+ }
+ inline wxProperty *GetValidatorProperty(void) const
+ {
+ return m_validatorProperty;
+ }
virtual bool StringToFloat (wxChar *s, float *number);
virtual bool StringToDouble (wxChar *s, double *number);
@@ -226,19 +242,20 @@
* Property value class
*/
-typedef enum {
- wxPropertyValueNull,
- wxPropertyValueInteger,
- wxPropertyValueReal,
- wxPropertyValuebool,
- wxPropertyValueString,
- wxPropertyValueList,
- wxPropertyValueIntegerPtr,
- wxPropertyValueLongPtr,
- wxPropertyValueRealPtr,
- wxPropertyValueDoublePtr,
- wxPropertyValueboolPtr,
- wxPropertyValueStringPtr
+typedef enum
+{
+ wxPropertyValueNull,
+ wxPropertyValueInteger,
+ wxPropertyValueReal,
+ wxPropertyValuebool,
+ wxPropertyValueString,
+ wxPropertyValueList,
+ wxPropertyValueIntegerPtr,
+ wxPropertyValueLongPtr,
+ wxPropertyValueRealPtr,
+ wxPropertyValueDoublePtr,
+ wxPropertyValueboolPtr,
+ wxPropertyValueStringPtr
} wxPropertyValueType;
class wxPropertyValue: public wxObject
@@ -266,8 +283,14 @@
~wxPropertyValue(void);
- virtual inline wxPropertyValueType Type(void) const { return m_type; }
- virtual inline void SetType(wxPropertyValueType typ) { m_type = typ; }
+ virtual inline wxPropertyValueType Type(void) const
+ {
+ return m_type;
+ }
+ virtual inline void SetType(wxPropertyValueType typ)
+ {
+ m_type = typ;
+ }
virtual long IntegerValue(void) const;
virtual float RealValue(void) const;
virtual bool BoolValue(void) const;
@@ -316,13 +339,25 @@
// Clear list
virtual void ClearList(void);
- virtual inline void SetClientData(wxObject *data) { m_clientData = data; }
- virtual inline wxObject *GetClientData(void) { return m_clientData; }
+ virtual inline void SetClientData(wxObject *data)
+ {
+ m_clientData = data;
+ }
+ virtual inline wxObject *GetClientData(void)
+ {
+ return m_clientData;
+ }
virtual wxString GetStringRepresentation(void);
- inline void SetModified(bool flag = true) { m_modifiedFlag = flag; }
- inline bool GetModified(void) { return m_modifiedFlag; }
+ inline void SetModified(bool flag = true)
+ {
+ m_modifiedFlag = flag;
+ }
+ inline bool GetModified(void)
+ {
+ return m_modifiedFlag;
+ }
// Operators
void operator=(const wxPropertyValue& val);
@@ -343,7 +378,8 @@
wxPropertyValueType m_type;
bool m_modifiedFlag;
- union {
+ union
+ {
long integer; // Also doubles as bool
wxChar* string;
float real;
@@ -392,11 +428,23 @@
virtual void SetName(wxString& nm);
virtual void SetRole(wxString& role);
void operator=(const wxPropertyValue& val);
- virtual inline void SetWindow(wxWindow *win) { m_propertyWindow = win; }
- virtual inline wxWindow *GetWindow(void) const { return m_propertyWindow; }
+ virtual inline void SetWindow(wxWindow *win)
+ {
+ m_propertyWindow = win;
+ }
+ virtual inline wxWindow *GetWindow(void) const
+ {
+ return m_propertyWindow;
+ }
- inline void Enable(bool en) { m_enabled = en; }
- inline bool IsEnabled(void) const { return m_enabled; }
+ inline void Enable(bool en)
+ {
+ m_enabled = en;
+ }
+ inline bool IsEnabled(void) const
+ {
+ return m_enabled;
+ }
};
inline
Modified: trunk/jazz/src/DeprecatedWx/propform.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/propform.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/DeprecatedWx/propform.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -74,15 +74,36 @@
// Extend event processing to process OnCommand
virtual bool ProcessEvent(wxEvent& event);
- inline virtual void AssociatePanel(wxWindow *win) { m_propertyWindow = win; }
- inline virtual wxWindow *GetPanel(void) const { return m_propertyWindow; }
+ inline virtual void AssociatePanel(wxWindow *win)
+ {
+ m_propertyWindow = win;
+ }
+ inline virtual wxWindow *GetPanel(void) const
+ {
+ return m_propertyWindow;
+ }
- inline virtual void SetManagedWindow(wxWindow *win) { m_managedWindow = win; }
- inline virtual wxWindow *GetManagedWindow(void) const { return m_managedWindow; }
+ inline virtual void SetManagedWindow(wxWindow *win)
+ {
+ m_managedWindow = win;
+ }
+ inline virtual wxWindow *GetManagedWindow(void) const
+ {
+ return m_managedWindow;
+ }
- inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
- inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
- inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
+ inline virtual wxButton *GetWindowCloseButton() const
+ {
+ return m_windowCloseButton;
+ }
+ inline virtual wxButton *GetWindowCancelButton() const
+ {
+ return m_windowCancelButton;
+ }
+ inline virtual wxButton *GetHelpButton() const
+ {
+ return m_windowHelpButton;
+ }
public:
static bool sm_dialogCancelled;
@@ -121,13 +142,20 @@
DECLARE_DYNAMIC_CLASS(wxPropertyFormValidator)
protected:
public:
- wxPropertyFormValidator(long flags = 0): wxPropertyValidator(flags) { }
- ~wxPropertyFormValidator(void) {}
+ wxPropertyFormValidator(long flags = 0): wxPropertyValidator(flags)
+ {
+ }
+ ~wxPropertyFormValidator(void)
+ {
+ }
// Called to check value is OK (e.g. when OK is pressed)
// Return false if value didn't check out; signal to restore old value.
virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) ) { return true; }
+ wxWindow *WXUNUSED(parentWindow) )
+ {
+ return true;
+ }
// Does the transferance from the property editing area to the property itself.
// Called by the view, e.g. when closing the window.
@@ -137,13 +165,21 @@
virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
virtual void OnDoubleClick( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) ) { }
+ wxWindow *WXUNUSED(parentWindow) )
+ {
+ }
virtual void OnSetFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) ) { }
+ wxWindow *WXUNUSED(parentWindow) )
+ {
+ }
virtual void OnKillFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) ) { }
+ wxWindow *WXUNUSED(parentWindow) )
+ {
+ }
virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}
+ wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) )
+ {
+ }
private:
};
@@ -160,7 +196,9 @@
{
m_realMin = min; m_realMax = max;
}
- ~wxRealFormValidator(void) {}
+ ~wxRealFormValidator(void)
+ {
+ }
bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
@@ -181,7 +219,9 @@
{
m_integerMin = min; m_integerMax = max;
}
- ~wxIntegerFormValidator(void) {}
+ ~wxIntegerFormValidator(void)
+ {
+ }
bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
@@ -200,7 +240,9 @@
wxBoolFormValidator(long flags = 0):wxPropertyFormValidator(flags)
{
}
- ~wxBoolFormValidator(void) {}
+ ~wxBoolFormValidator(void)
+ {
+ }
bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
@@ -278,8 +320,14 @@
// Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event);
- void SetView(wxPropertyFormView* view) { m_view = view; }
- wxPropertyFormView* GetView() const { return m_view; }
+ void SetView(wxPropertyFormView* view)
+ {
+ m_view = view;
+ }
+ wxPropertyFormView* GetView() const
+ {
+ return m_view;
+ }
private:
wxPropertyFormView* m_view;
@@ -311,7 +359,10 @@
// Must call this to create panel and associate view
virtual bool Initialize(void);
virtual wxPanel *OnCreatePanel(wxFrame *parent, wxPropertyFormView *v);
- inline virtual wxPanel *GetPropertyPanel(void) const { return m_propertyPanel; }
+ inline virtual wxPanel *GetPropertyPanel(void) const
+ {
+ return m_propertyPanel;
+ }
private:
wxPropertyFormView* m_view;
Modified: trunk/jazz/src/DeprecatedWx/proplist.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/DeprecatedWx/proplist.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -144,23 +144,65 @@
void OnEdit(wxCommandEvent& event);
void OnText(wxCommandEvent& event);
- inline virtual wxListBox *GetPropertyScrollingList() const { return m_propertyScrollingList; }
- inline virtual wxListBox *GetValueList() const { return m_valueList; }
- inline virtual wxTextCtrl *GetValueText() const { return m_valueText; }
- inline virtual wxButton *GetConfirmButton() const { return m_confirmButton; }
- inline virtual wxButton *GetCancelButton() const { return m_cancelButton; }
- inline virtual wxButton *GetEditButton() const { return m_editButton; }
- inline virtual bool GetDetailedEditing(void) const { return m_detailedEditing; }
+ inline virtual wxListBox *GetPropertyScrollingList() const
+ {
+ return m_propertyScrollingList;
+ }
+ inline virtual wxListBox *GetValueList() const
+ {
+ return m_valueList;
+ }
+ inline virtual wxTextCtrl *GetValueText() const
+ {
+ return m_valueText;
+ }
+ inline virtual wxButton *GetConfirmButton() const
+ {
+ return m_confirmButton;
+ }
+ inline virtual wxButton *GetCancelButton() const
+ {
+ return m_cancelButton;
+ }
+ inline virtual wxButton *GetEditButton() const
+ {
+ return m_editButton;
+ }
+ inline virtual bool GetDetailedEditing(void) const
+ {
+ return m_detailedEditing;
+ }
- inline virtual void AssociatePanel(wxPanel *win) { m_propertyWindow = win; }
- inline virtual wxPanel *GetPanel(void) const { return m_propertyWindow; }
+ inline virtual void AssociatePanel(wxPanel *win)
+ {
+ m_propertyWindow = win;
+ }
+ inline virtual wxPanel *GetPanel(void) const
+ {
+ return m_propertyWindow;
+ }
- inline virtual void SetManagedWindow(wxWindow *win) { m_managedWindow = win; }
- inline virtual wxWindow *GetManagedWindow(void) const { return m_managedWindow; }
+ inline virtual void SetManagedWindow(wxWindow *win)
+ {
+ m_managedWindow = win;
+ }
+ inline virtual wxWindow *GetManagedWindow(void) const
+ {
+ return m_managedWindow;
+ }
- inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
- inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
- inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
+ inline virtual wxButton *GetWindowCloseButton() const
+ {
+ return m_windowCloseButton;
+ }
+ inline virtual wxButton *GetWindowCancelButton() const
+ {
+ return m_windowCancelButton;
+ }
+ inline virtual wxButton *GetHelpButton() const
+ {
+ return m_windowHelpButton;
+ }
bool OnClose(void);
@@ -223,8 +265,12 @@
class WXDLLIMPEXP_DEPRECATED wxPropertyListValidator: public wxPropertyValidator
{
public:
- wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags) { }
- ~wxPropertyListValidator() {}
+ wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags)
+ {
+ }
+ ~wxPropertyListValidator()
+ {
+ }
// Called when the property is selected or deselected: typically displays the value
// in the edit control (having chosen a suitable control to display: (non)editable text or listbox)
@@ -329,8 +375,14 @@
~wxPropertyListPanel();
void OnDefaultAction(wxControl *item);
- inline void SetView(wxPropertyListView* v) { m_view = v; }
- inline wxPropertyListView* GetView() const { return m_view; }
+ inline void SetView(wxPropertyListView* v)
+ {
+ m_view = v;
+ }
+ inline wxPropertyListView* GetView() const
+ {
+ return m_view;
+ }
// Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event);
@@ -370,8 +422,14 @@
// Must call this to create panel and associate view
virtual bool Initialize(void);
virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
- inline virtual wxPropertyListPanel *GetPropertyPanel(void) const { return m_propertyPanel; }
- inline wxPropertyListView* GetView() const { return m_view; }
+ inline virtual wxPropertyListPanel *GetPropertyPanel(void) const
+ {
+ return m_propertyPanel;
+ }
+ inline wxPropertyListView* GetView() const
+ {
+ return m_view;
+ }
private:
wxPropertyListView* m_view;
@@ -392,7 +450,9 @@
// 0.0, 0.0 means no range
wxRealListValidator(float min = 0.0, float max = 0.0, long flags = wxPROP_ALLOW_TEXT_EDITING):wxPropertyListValidator(flags)
{ m_realMin = min; m_realMax = max; }
- ~wxRealListValidator() {}
+ ~wxRealListValidator()
+ {
+ }
bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
@@ -421,7 +481,9 @@
{
m_integerMin = min; m_integerMax = max;
}
- ~wxIntegerListValidator() {}
+ ~wxIntegerListValidator()
+ {
+ }
bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
@@ -445,8 +507,12 @@
class WXDLLIMPEXP_DEPRECATED wxBoolListValidator: public wxPropertyListValidator
{
public:
- wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags) {}
- ~wxBoolListValidator() {}
+ wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags)
+ {
+ }
+ ~wxBoolListValidator()
+ {
+ }
bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
bool OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
@@ -562,7 +628,9 @@
{
public:
wxListOfStringsListValidator(long flags = 0);
- ~wxListOfStringsListValidator() {}
+ ~wxListOfStringsListValidator()
+ {
+ }
bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
Modified: trunk/jazz/src/Dialogs/copyright.cpp
===================================================================
--- trunk/jazz/src/Dialogs/copyright.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Dialogs/copyright.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -52,7 +52,8 @@
sheet->AddProperty(copyrightProp);
}
-bool tCopyrightDlg::OnClose(){
+bool tCopyrightDlg::OnClose()
+{
song->GetTrack(0)->SetCopyright(copyrightProp->GetValue().StringValue() );
return FALSE;
}
Modified: trunk/jazz/src/Dialogs/midiThruDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/midiThruDialog.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Dialogs/midiThruDialog.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -65,7 +65,8 @@
void tMidiThruDlg::EditForm(wxPanel *panel)
{
- if (Midi->SupportsMultipleDevices()) {
+ if (Midi->SupportsMultipleDevices())
+ {
Add(InputDeviceChoice.mkFormItem(300, 50));
Add(wxMakeFormNewLine());
Add(OutputDeviceChoice.mkFormItem(300, 50));
Modified: trunk/jazz/src/DynamicArray.h
===================================================================
--- trunk/jazz/src/DynamicArray.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/DynamicArray.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -216,8 +216,14 @@
JZIntArray mArray;
// this works for sizeof(int) >= 4
- int index(int i) { return i >> 5; }
- int mask(int i) { return 1 << (i & 31); }
+ int index(int i)
+ {
+ return i >> 5;
+ }
+ int mask(int i)
+ {
+ return 1 << (i & 31);
+ }
};
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Events.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -363,32 +363,110 @@
return (mClock & KILLED_CLOCK) != 0;
}
- virtual JZMetaEvent* IsMetaEvent() { return 0; }
- virtual JZChannelEvent* IsChannelEvent() { return 0; }
- virtual JZKeyOnEvent* IsKeyOn() { return 0; }
- virtual JZKeyOffEvent* IsKeyOff() { return 0; }
- virtual JZPitchEvent* IsPitch() { return 0; }
- virtual JZControlEvent* IsControl() { return 0; }
- virtual JZProgramEvent* IsProgram() { return 0; }
- virtual JZSysExEvent* IsSysEx() { return 0; }
- virtual JZSongPtrEvent* IsSongPtr() { return 0; }
- virtual JZMidiClockEvent* IsMidiClock() { return 0; }
- virtual JZStartPlayEvent* IsStartPlay() { return 0; }
- virtual JZContPlayEvent* IsContPlay() { return 0; }
- virtual JZStopPlayEvent* IsStopPlay() { return 0; }
- virtual JZTextEvent* IsText() { return 0; }
- virtual JZCopyrightEvent* IsCopyright() { return 0; }
- virtual JZTrackNameEvent* IsTrackName() { return 0; }
- virtual JZMarkerEvent* IsMarker() { return 0; }
- virtual JZSetTempoEvent* IsSetTempo() { return 0; }
- virtual JZMtcOffsetEvent* IsMtcOffset() { return 0; }
- virtual JZTimeSignatEvent* IsTimeSignat() { return 0; }
- virtual JZKeySignatEvent* IsKeySignat() { return 0; }
- virtual JZKeyPressureEvent* IsKeyPressure() { return 0; }
- virtual JZJazzMetaEvent* IsJazzMeta() { return 0; }
- virtual JZPlayTrackEvent* IsPlayTrack() { return 0; }
- virtual JZEndOfTrackEvent* IsEndOfTrack() { return 0; }
- virtual JZChnPressureEvent* IsChnPressure() { return 0; }
+ virtual JZMetaEvent* IsMetaEvent()
+ {
+ return 0;
+ }
+ virtual JZChannelEvent* IsChannelEvent()
+ {
+ return 0;
+ }
+ virtual JZKeyOnEvent* IsKeyOn()
+ {
+ return 0;
+ }
+ virtual JZKeyOffEvent* IsKeyOff()
+ {
+ return 0;
+ }
+ virtual JZPitchEvent* IsPitch()
+ {
+ return 0;
+ }
+ virtual JZControlEvent* IsControl()
+ {
+ return 0;
+ }
+ virtual JZProgramEvent* IsProgram()
+ {
+ return 0;
+ }
+ virtual JZSysExEvent* IsSysEx()
+ {
+ return 0;
+ }
+ virtual JZSongPtrEvent* IsSongPtr()
+ {
+ return 0;
+ }
+ virtual JZMidiClockEvent* IsMidiClock()
+ {
+ return 0;
+ }
+ virtual JZStartPlayEvent* IsStartPlay()
+ {
+ return 0;
+ }
+ virtual JZContPlayEvent* IsContPlay()
+ {
+ return 0;
+ }
+ virtual JZStopPlayEvent* IsStopPlay()
+ {
+ return 0;
+ }
+ virtual JZTextEvent* IsText()
+ {
+ return 0;
+ }
+ virtual JZCopyrightEvent* IsCopyright()
+ {
+ return 0;
+ }
+ virtual JZTrackNameEvent* IsTrackName()
+ {
+ return 0;
+ }
+ virtual JZMarkerEvent* IsMarker()
+ {
+ return 0;
+ }
+ virtual JZSetTempoEvent* IsSetTempo()
+ {
+ return 0;
+ }
+ virtual JZMtcOffsetEvent* IsMtcOffset()
+ {
+ return 0;
+ }
+ virtual JZTimeSignatEvent* IsTimeSignat()
+ {
+ return 0;
+ }
+ virtual JZKeySignatEvent* IsKeySignat()
+ {
+ return 0;
+ }
+ virtual JZKeyPressureEvent* IsKeyPressure()
+ {
+ return 0;
+ }
+ virtual JZJazzMetaEvent* IsJazzMeta()
+ {
+ return 0;
+ }
+ virtual JZPlayTrackEvent* IsPlayTrack()
+ {
+ return 0;
+ }
+ virtual JZEndOfTrackEvent* IsEndOfTrack()
+ {
+ return 0;
+ }
+ virtual JZChnPressureEvent* IsChnPressure()
+ {
+ return 0;
+ }
virtual int Write(JZWriteBase& io)
{
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Harmony.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -382,7 +382,9 @@
class tHBPlayerForm : public wxForm
{
public:
- tHBPlayerForm() : wxForm( USED_WXFORM_BUTTONS ) {}
+ tHBPlayerForm() : wxForm( USED_WXFORM_BUTTONS )
+ {
+ }
void OnHelp()
{
gpHelpInstance->ShowTopic("Harmony browser");
@@ -1164,9 +1166,15 @@
{
public:
HBSettingsForm(HBCanvas *c)
- : wxForm( USED_WXFORM_BUTTONS )
- { mpHbWindow = c; }
- virtual void OnOk() { mpHbWindow->OnPaint(); wxForm::OnOk(); }
+ : wxForm( USED_WXFORM_BUTTONS )
+ {
+ mpHbWindow = c;
+ }
+ virtual void OnOk()
+ {
+ mpHbWindow->OnPaint();
+ wxForm::OnOk();
+ }
virtual void OnHelp();
private:
HBCanvas *mpHbWindow;
@@ -1637,8 +1645,14 @@
HBChord scale;
int chord_key;
int scale_key;
- int ChordKey(int i = 0) const { return (chord_key + i) % 12; }
- int ScaleKey(int i = 0) const { return (chord_key + i) % 12; } // yes, its chord_key!
+ int ChordKey(int i = 0) const
+ {
+ return (chord_key + i) % 12;
+ }
+ int ScaleKey(int i = 0) const
+ {
+ return (chord_key + i) % 12;
+ }
HBContext *pcontext;
HBPlayer player;
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -320,7 +320,8 @@
#else
-class tChordMatrix {
+class tChordMatrix
+{
public:
tChordMatrix()
{
Modified: trunk/jazz/src/HarmonyP.cpp
===================================================================
--- trunk/jazz/src/HarmonyP.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/HarmonyP.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -576,7 +576,8 @@
#if 0
#include <ctype.h>
-struct scdef {
+struct scdef
+{
const char *name;
const char *def;
};
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/PianoFrame.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -563,7 +563,11 @@
JZPianoFrame *pPianoWindow;
public:
- tVisibleDlg(JZPianoFrame *p) : wxForm( USED_WXFORM_BUTTONS ), pPianoWindow(p) {}
+ tVisibleDlg(JZPianoFrame *p)
+ : wxForm( USED_WXFORM_BUTTONS ),
+ pPianoWindow(p)
+ {
+ }
void EditForm(wxPanel *panel);
virtual void OnOk();
virtual void OnHelp();
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Player.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -624,8 +624,15 @@
virtual bool IsInstalled();
virtual ~tSeq2Player();
int OutEvent(JZEvent *e, int now);
- int OutEvent(JZEvent *e) { OutEvent(e, 0); return 0; }
- void OutNow(JZEvent *e) { OutEvent(e, 1); }
+ int OutEvent(JZEvent *e)
+ {
+ OutEvent(e, 0);
+ return 0;
+ }
+ void OutNow(JZEvent *e)
+ {
+ OutEvent(e, 1);
+ }
void OutBreak();
void OutBreak(long BreakOver);
void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
@@ -635,7 +642,6 @@
void SetSoftThru(int on, int idev, int odev);
int FindMidiDevice();
-
protected:
long play_clock;
Modified: trunk/jazz/src/Random.h
===================================================================
--- trunk/jazz/src/Random.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Random.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -57,32 +57,58 @@
public:
- int Null() { return nul; }
- void SetNull(int n) { nul = n; }
+ int Null()
+ {
+ return nul;
+ }
+ void SetNull(int n)
+ {
+ nul = n;
+ }
JZRndArray(int n, int min, int max);
JZRndArray & operator = (const JZRndArray &);
JZRndArray(JZRndArray const &);
virtual ~JZRndArray();
- int &operator[] (int i) { return mArray[i]; }
- int operator[] (int i) const { return mArray[i]; }
+ int &operator[] (int i)
+ {
+ return mArray[i];
+ }
+ int operator[] (int i) const
+ {
+ return mArray[i];
+ }
/* PAT - The following ifdef was removed due to changes in gcc 3.x. If it
needs to be put back for compatibility purposes, it will need to return
in an alternate form. */
/*#ifdef FOR_MSW*/
double operator[](double f);
- float operator[](float f) {
+ float operator[](float f)
+ {
/*#else
double operator[](double f) const;
- float operator[](float f) const {
+ float operator[](float f) const
+ {
#endif*/
return (float)operator[]((double)f);
}
- int Size() const { return n; }
- int Min() const { return min; }
- int Max() const { return max; }
+ int Size() const
+ {
+ return n;
+ }
+ int Min() const
+ {
+ return min;
+ }
+ int Max() const
+ {
+ return max;
+ }
void SetMinMax(int min, int max);
- void Resize(int nn) { n = nn; }
+ void Resize(int nn)
+ {
+ n = nn;
+ }
friend std::ostream & operator << (std::ostream &, JZRndArray const &);
friend std::istream & operator >> (std::istream &, JZRndArray &);
@@ -175,14 +201,22 @@
virtual void SetLabel(char const *llabel);
void Enable(int enable = 1);
- void SetStyle(int style) { style_bits = style; }
+ void SetStyle(int style)
+ {
+ style_bits = style;
+ }
// min and max value in array (both values inclusive)
void SetYMinMax(int min, int max);
// for display x-axis only, does not resize the array (both values inclusive)
void SetXMinMax(int xmin, int xmax);
void DrawBarLine (wxDC *dc, int xx);
- void SetDrawBars(tArrayEditDrawBars *x) { draw_bars = x; }
- void Init() {}
+ void SetDrawBars(tArrayEditDrawBars *x)
+ {
+ draw_bars = x;
+ }
+ void Init()
+ {
+ }
DECLARE_EVENT_TABLE()
};
Modified: trunk/jazz/src/ResourceDialog.h
===================================================================
--- trunk/jazz/src/ResourceDialog.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/ResourceDialog.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -202,19 +202,28 @@
If the function returns true, the Attached data will be set and the
dialog will be hidden. */
- virtual bool OnOk() { return true; }
+ virtual bool OnOk()
+ {
+ return true;
+ }
/// Cancel event handler
/** Called when a dialog produced by Show() has caused a wxID_CANCEL event.
If the function returns true, the dialog will be hidden. */
- virtual bool OnCancel() { return true; }
+ virtual bool OnCancel()
+ {
+ return true;
+ }
/// Apply event handler
/** Called when a dialog produced by Show() has caused a wxID_APPLY event.
If the function returns true, the Attached data will be set. */
- virtual bool OnApply() { return true; }
+ virtual bool OnApply()
+ {
+ return true;
+ }
private:
Modified: trunk/jazz/src/Rhythm.h
===================================================================
--- trunk/jazz/src/Rhythm.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Rhythm.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -197,7 +197,10 @@
tArrayEdit *veloc_edit;
tRhyArrayEdit *rhythm_edit;
- enum { MAX_INSTRUMENTS = 20 };
+ enum
+ {
+ MAX_INSTRUMENTS = 20
+ };
tRhythm *instruments[MAX_INSTRUMENTS];
int n_instruments;
int act_instrument; // -1 if none
Modified: trunk/jazz/src/Sample.h
===================================================================
--- trunk/jazz/src/Sample.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Sample.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -110,7 +110,10 @@
float Peak(int fr = -1, int to = -1);
void Rescale(float maxval = 32766.0, int fr = -1, int to = -1);
void RescaleToShort(int fr = -1, int to = -1);
- float &operator[](int i) { return data[i]; }
+ float &operator[](int i)
+ {
+ return data[i];
+ }
void Initialize(int size = 0);
void PasteMix(tFloatSample &src, int offs = 0);
void PasteMix(tSample &src, int offs = 0);
@@ -197,7 +200,8 @@
* that is offs % set.GetChannels() == 0.
*/
-class tSample {
+class tSample
+{
friend class tFloatSample;
friend class tSplPan;
friend class tSplPitch;
@@ -216,43 +220,52 @@
// Properties
void SetLabel(const char *str);
- const char *GetLabel() const {
+ const char *GetLabel() const
+ {
return label;
}
- void SetVolume(int vol) {
+ void SetVolume(int vol)
+ {
dirty |= (vol != volume);
volume = vol;
}
- int GetVolume() const {
+ int GetVolume() const
+ {
return volume;
}
- void SetPan(int p) {
+ void SetPan(int p)
+ {
dirty |= (p != pan);
pan = p;
}
- int GetPan() const {
+ int GetPan() const
+ {
return pan;
}
- void SetPitch(int p) {
+ void SetPitch(int p)
+ {
dirty |= (p != pitch);
pitch = p;
}
- int GetPitch() const {
+ int GetPitch() const
+ {
return pitch;
}
void SetFilename(const char *fname);
- const char *GetFilename() const {
+ const char *GetFilename() const
+ {
return filename;
}
- int GetLength() const {
+ int GetLength() const
+ {
return length;
}
@@ -274,14 +287,16 @@
void Clear();
- void GotoRAM() {
+ void GotoRAM()
+ {
// Try to swap this sample into memory.
volatile short dummy;
for (int i = 0; i < length; i++)
dummy = data[i];
}
- short *GetData() {
+ short *GetData()
+ {
return data;
}
@@ -290,11 +305,13 @@
* access global adustments from tSampleSet
*/
- tSampleSet &SampleSet() {
+ tSampleSet &SampleSet()
+ {
return set;
}
- tSampleSet *operator->() {
+ tSampleSet *operator->()
+ {
return &set;
}
Modified: trunk/jazz/src/SampleCommand.h
===================================================================
--- trunk/jazz/src/SampleCommand.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/SampleCommand.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -38,13 +38,19 @@
class tPaintableCommand
{
public:
- tPaintableCommand(tSample &s) : spl(s) {}
+ tPaintableCommand(tSample &s) : spl(s)
+ {
+ }
virtual int NumArrays() = 0;
virtual JZRndArray & GetArray(int i) = 0;
virtual const char * GetLabel(int i) = 0;
virtual void Execute(long fr, long to) = 0;
- virtual void Initialize() {}
- virtual ~tPaintableCommand() {}
+ virtual void Initialize()
+ {
+ }
+ virtual ~tPaintableCommand()
+ {
+ }
protected:
tSample &spl;
};
@@ -57,9 +63,18 @@
{
public:
tPaintableCommand1(tSample &s, int num, int min, int max)
- : tPaintableCommand(s), arr(num, min, max) { }
- virtual int NumArrays() { return 1; }
- virtual JZRndArray & GetArray(int i) { return arr; }
+ : tPaintableCommand(s),
+ arr(num, min, max)
+ {
+ }
+ virtual int NumArrays()
+ {
+ return 1;
+ }
+ virtual JZRndArray & GetArray(int i)
+ {
+ return arr;
+ }
virtual void Initialize();
protected:
JZRndArray arr;
@@ -69,27 +84,46 @@
class tSplVolume : public tPaintableCommand1
{
public:
- const char * GetLabel(int i) { return "volume"; }
- tSplVolume(tSample &s) : tPaintableCommand1(s, 200, -100, 100) { }
+ const char * GetLabel(int i)
+ {
+ return "volume";
+ }
+ tSplVolume(tSample &s) : tPaintableCommand1(s, 200, -100, 100)
+ {
+ }
void Execute(long fr, long to);
};
class tSplPan : public tPaintableCommand1
{
public:
- const char * GetLabel(int i) { return "pan"; }
- tSplPan(tSample &s) : tPaintableCommand1(s, 200, -100, 100) { }
+ const char * GetLabel(int i)
+ {
+ return "pan";
+ }
+ tSplPan(tSample &s) : tPaintableCommand1(s, 200, -100, 100)
+ {
+ }
void Execute(long fr, long to);
};
class tSplPitch : public tPaintableCommand1
{
public:
- const char * GetLabel(int i) { return "pitch"; }
- tSplPitch(tSample &s) : tPaintableCommand1(s, 200, -100, 100) { range = 1.2f; }
+ const char * GetLabel(int i)
+ {
+ return "pitch";
+ }
+ tSplPitch(tSample &s) : tPaintableCommand1(s, 200, -100, 100)
+ {
+ range = 1.2f;
+ }
void Execute(long fr, long to);
// range = frequency factor, e.g. 2 will transpose on octave up or down
- void SetRange(float r) { range = r; }
+ void SetRange(float r)
+ {
+ range = r;
+ }
private:
float range;
};
@@ -119,7 +153,10 @@
float SR;
int resetval;
- enum { SIZE = 512 };
+ enum
+ {
+ SIZE = 512
+ };
float array[SIZE];
float tabs[2]; /* for lineset */
int lineset;
@@ -131,7 +168,8 @@
friend class tWahSettingsForm;
public:
tWahWah(tSample &s);
- virtual const char * GetLabel(int i) {
+ virtual const char * GetLabel(int i)
+ {
return "freq";
}
virtual void Execute(long fr, long to);
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/SampleDialog.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -336,7 +336,8 @@
double fy = ymap.XToY(arr[(float)fx]);
data[i] = (short)fy;
}
- else {
+ else
+ {
x = -x;
double fx = xmap.XToY(x);
double fy = ymap.XToY(arr[(float)fx]);
Modified: trunk/jazz/src/SampleDialog.h
===================================================================
--- trunk/jazz/src/SampleDialog.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/SampleDialog.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -135,7 +135,10 @@
wxSlider *midi_key_slider;
wxSlider *duration_slider;
- enum { MAXSYNTHS = 6 };
+ enum
+ {
+ MAXSYNTHS = 6
+ };
tAddSynth *synths[MAXSYNTHS];
static int num_synths;
static int midi_key;
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/SampleWindow.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -273,7 +273,8 @@
Start(100);
}
- bool IsListening() const {
+ bool IsListening() const
+ {
return gpMidiPlayer->IsListening();
}
@@ -931,7 +932,8 @@
offs = cnvs->sel_fr;
return TRUE;
}
- else {
+ else
+ {
offs = -1;
if (warn)
wxMessageBox("please set insertion point first", "Error", wxOK);
Modified: trunk/jazz/src/SampleWindow.h
===================================================================
--- trunk/jazz/src/SampleWindow.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/SampleWindow.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -52,13 +52,19 @@
virtual void OnMenuCommand(int id);
void Redraw();
bool HaveInsertionPoint(int &offs, bool warn = TRUE);
- enum HaveSelectionMode { SelWarn, SelNoWarn, SelAll} ;
+ enum HaveSelectionMode
+ {
+ SelWarn,
+ SelNoWarn,
+ SelAll
+ };
bool HaveSelection(int &fr_smpl, int &to_smpl, HaveSelectionMode = SelAll);
void AddParam(JZRndArray *array, const char *label);
void ClrParam();
void ClearSelection();
- tSample &GetSample() {
+ tSample &GetSample()
+ {
return spl;
}
void PlaySample();
@@ -85,7 +91,10 @@
static tSample *copy_buffer;
- enum { MAXPARAM = 4 };
+ enum
+ {
+ MAXPARAM = 4
+ };
tArrayEdit *params[MAXPARAM];
int num_params;
Modified: trunk/jazz/src/Signal2.h
===================================================================
--- trunk/jazz/src/Signal2.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Signal2.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -82,8 +82,11 @@
class tExpoMap
{
public:
- tExpoMap(T x, T y) : map(-x, x, -log(y), log(y)) { }
- T operator()(T x) {
+ tExpoMap(T x, T y) : map(-x, x, -log(y), log(y))
+ {
+ }
+ T operator()(T x)
+ {
return exp(map(x));
}
private:
@@ -351,11 +354,14 @@
current = -1;
}
- virtual ~tSigInput() {}
+ virtual ~tSigInput()
+ {
+ }
void GetSample(tSigValue &ret)
{
- if (synth.current >= current) {
+ if (synth.current >= current)
+ {
current = synth.current + 1;
NextValue();
}
@@ -364,7 +370,8 @@
float GetControl()
{
- if (synth.current >= current) {
+ if (synth.current >= current)
+ {
current = synth.current + 100;
NextValue();
ctl = 0;
@@ -375,15 +382,21 @@
return ctl;
}
- int HasChanged() const {
+ int HasChanged() const
+ {
return synth.current >= current;
}
- virtual void Init() { // called once before performance starts
+ virtual void Init()
+ {
+ // called once before performance starts
current = -1;
}
- virtual long GetLength() { return 0; }
+ virtual long GetLength()
+ {
+ return 0;
+ }
virtual void NextValue() = 0;
protected:
@@ -401,7 +414,9 @@
class tSigOutput : public tSigInput
{
public:
- tSigOutput(tSigSynth &synth) : tSigInput(synth) {}
+ tSigOutput(tSigSynth &synth) : tSigInput(synth)
+ {
+ }
virtual void Out(const tSigValue &v) = 0;
virtual void Resize(long) = 0;
};
@@ -595,28 +610,34 @@
have_freq_control = 0;
}
- virtual void Init() {
+ virtual void Init()
+ {
tSignalModifier::Init();
have_freq_control = (controls.size() != 0);
}
- tSigValue & operator[](int i) {
+ tSigValue & operator[](int i)
+ {
return array[i];
}
- const tSigValue & operator[](int i) const {
+ const tSigValue & operator[](int i) const
+ {
return array[i];
}
- void NextValue() {
- if (have_freq_control && controls[0]->HasChanged()) {
+ void NextValue()
+ {
+ if (have_freq_control && controls[0]->HasChanged())
+ {
dx = array.Size() / SR * freq * fmap(controls[0]->GetControl());
}
array.CyclicInterpolate(val, x);
x += dx;
}
- long Size() const {
+ long Size() const
+ {
return array.Size();
}
@@ -643,19 +664,23 @@
{
}
- tSigValue & operator[](int i) {
+ tSigValue & operator[](int i)
+ {
return array[i];
}
- const tSigValue & operator[](int i) const {
+ const tSigValue & operator[](int i) const
+ {
return array[i];
}
- void NextValue() {
+ void NextValue()
+ {
array.Interpolate(val, xmap(current));
}
- long Size() const {
+ long Size() const
+ {
return array.Size();
}
@@ -674,7 +699,8 @@
{
}
- void NextValue() {
+ void NextValue()
+ {
for (int i = 0; i < channels; i++)
val[i] = ((rnd.asDouble() * 2.0) - 1.0) * 32000.0;
}
@@ -694,7 +720,9 @@
val[i] = x;
}
- virtual void NextValue() {}
+ virtual void NextValue()
+ {
+ }
};
@@ -712,7 +740,8 @@
map.Initialize(0, plen, phi, phi + 2 * PI);
ampl = amp;
}
- void NextValue() {
+ void NextValue()
+ {
float y = ampl * sin(map((double)current));
for (int i = 0; i < channels; i++)
val[i] = y;
@@ -732,8 +761,11 @@
class tSigVolume : public tSignalModifier
{
public:
- tSigVolume(tSigSynth &synth) : tSignalModifier(synth) {}
- void NextValue() {
+ tSigVolume(tSigSynth &synth) : tSignalModifier(synth)
+ {
+ }
+ void NextValue()
+ {
float vol = controls[0]->GetControl();
inputs[0]->GetSample(val);
for (int i = 0; i < channels; i++)
@@ -749,8 +781,11 @@
class tSigPanpot : public tSignalModifier
{
public:
- tSigPanpot(tSigSynth &synth) : tSignalModifier(synth) {}
- void NextValue() {
+ tSigPanpot(tSigSynth &synth) : tSignalModifier(synth)
+ {
+ }
+ void NextValue()
+ {
float p = controls[0]->GetControl();
inputs[0]->GetSample(val);
if (p > 0)
@@ -840,12 +875,14 @@
virtual ~tOpHighpass()
{
}
- virtual void Setup(float sr, float hp, float dummy) {
+ virtual void Setup(float sr, float hp, float dummy)
+ {
double b = 2.0 - cos(hp * 2.0 * PI / sr);
c2 = b - sqrt(b * b - 1.0);
c1 = 1.0 - c2;
}
- virtual float Loop(float sig) {
+ virtual float Loop(float sig)
+ {
float tmp = y1 = c2 * (y1 + sig);
y1 -= sig;
return tmp;
@@ -928,12 +965,15 @@
this->freq = freq;
this->bandw = bandw;
}
- virtual void Init() {
+ virtual void Init()
+ {
tSignalModifier::Init();
have_control = (controls.size() == 1);
}
- void NextValue() {
- if (have_control && controls[0]->HasChanged()) {
+ void NextValue()
+ {
+ if (have_control && controls[0]->HasChanged())
+ {
float f = freq * fmap(controls[0]->GetControl());
for (int i = 0; i < channels; i++)
filter[i].Setup(sr, f, bandw);
@@ -942,7 +982,8 @@
for (int i = 0; i < channels; i++)
val[i] = filter[i].FILTER::Loop(val[i]);
}
- tSigValue operator()(const tSigValue &sig) {
+ tSigValue operator()(const tSigValue &sig)
+ {
for (int i = 0; i < channels; i++)
val[i] = filter[i].FILTER::Loop(sig[i]);
return val;
@@ -965,7 +1006,8 @@
{
public:
- tSigLowpass(tSigSynth &synth, float fg) : tSignalModifier(synth) {
+ tSigLowpass(tSigSynth &synth, float fg) : tSignalModifier(synth)
+ {
fg = fg / sampling_rate;
a0 = 2 * PI * fg;
// b1 = a0 - 1.0; // approx
@@ -979,7 +1021,8 @@
val = sig * a0 - val * b1;
}
- tSigValue operator()(const tSigValue &sig) {
+ tSigValue operator()(const tSigValue &sig)
+ {
val = sig * a0 - val * b1;
return val;
}
@@ -1075,7 +1118,11 @@
class tSigReverb : public tSignalModifier
{
public:
- enum { COMBS = 4, ALPAS = 2 };
+ enum
+ {
+ COMBS = 4,
+ ALPAS = 2
+ };
tSigReverb(
tSigSynth &synth,
float reverb_time = 0.7,
@@ -1136,11 +1183,13 @@
{
lfo.Init(*this);
}
- virtual int operator()(tSigValue &val) {
+ virtual int operator()(tSigValue &val)
+ {
if (!sig(val))
return 0;
float a = (lfo() + 1)/2; // map to 0..1
- if (channels > 1) {
+ if (channels > 1)
+ {
float tmp = val[0];
val[0] -= a * val[1];
val[1] -= a * tmp;
@@ -1160,15 +1209,19 @@
class tSigMix2 : public tSignalModifier
{
public:
- tSigMix2(tSigSynth &synth) : tSignalModifier(synth) {}
+ tSigMix2(tSigSynth &synth) : tSignalModifier(synth)
+ {
+ }
- void Init() {
+ void Init()
+ {
tSignalModifier::Init(); // initialize sources
len1 = inputs[0]->GetLength();
len2 = inputs[1]->GetLength();
}
- void NextValue() {
+ void NextValue()
+ {
tSigValue v1;
tSigValue v2;
inputs[0]->GetSample(v1);
Modified: trunk/jazz/src/Synth.cpp
===================================================================
--- trunk/jazz/src/Synth.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Synth.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -37,10 +37,11 @@
using namespace std;
-#define SXDECL(id,len,arr) do {\
- sxlen[id] = len; \
- sxdata[id] = new unsigned char[len]; \
- memcpy(sxdata[id], arr, len); \
+#define SXDECL(id,len,arr) do\
+{\
+ sxlen[id] = len;\
+ sxdata[id] = new unsigned char[len];\
+ memcpy(sxdata[id], arr, len);\
} while (0)
Modified: trunk/jazz/src/Synth.h
===================================================================
--- trunk/jazz/src/Synth.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Synth.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -337,32 +337,79 @@
return Sysex(clk, SX_GM_MasterVol, vol );
}
- virtual JZEvent* MasterPanSX( long clk, unsigned char pan ) { return 0; }
+ virtual JZEvent* MasterPanSX( long clk, unsigned char pan )
+ {
+ return 0;
+ }
- virtual JZEvent* ModSX( int index, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* ModSX( int index, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* BendSX( int index, long clk, int cha, unsigned char val) { return 0; }
+ virtual JZEvent* BendSX( int index, long clk, int cha, unsigned char val)
+ {
+ return 0;
+ }
- virtual JZEvent* CafSX( int index, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* CafSX( int index, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* PafSX( int index, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* PafSX( int index, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* CC1SX( int index, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* CC1SX( int index, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* CC2SX( int index, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* CC2SX( int index, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* PartialReserveSX( long clk, int cha, unsigned char *valptr ) { return 0; }
- virtual JZEvent* RxChannelSX( long clk, int cha, unsigned char val ) { return 0; }
- virtual JZEvent* UseForRhythmSX( long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* PartialReserveSX( long clk, int cha, unsigned char *valptr )
+ {
+ return 0;
+ }
+ virtual JZEvent* RxChannelSX( long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
+ virtual JZEvent* UseForRhythmSX( long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* ControllerNumberSX( int ctrlno, long clk, int cha, unsigned char val ) { return 0; }
+ virtual JZEvent* ControllerNumberSX( int ctrlno, long clk, int cha, unsigned char val )
+ {
+ return 0;
+ }
- virtual JZEvent* ReverbMacroSX( long clk, unsigned char val, unsigned char lsb = 0 ) { return 0; }
- virtual JZEvent* ReverbParamSX( int index, long clk, unsigned char val ) { return 0; }
- virtual JZEvent* ChorusMacroSX( long clk, unsigned char val, unsigned char lsb = 0 ) { return 0; }
- virtual JZEvent* ChorusParamSX( int index, long clk, unsigned char val ) { return 0; }
+ virtual JZEvent* ReverbMacroSX( long clk, unsigned char val, unsigned char lsb = 0 )
+ {
+ return 0;
+ }
+ virtual JZEvent* ReverbParamSX( int index, long clk, unsigned char val )
+ {
+ return 0;
+ }
+ virtual JZEvent* ChorusMacroSX( long clk, unsigned char val, unsigned char lsb = 0 )
+ {
+ return 0;
+ }
+ virtual JZEvent* ChorusParamSX( int index, long clk, unsigned char val )
+ {
+ return 0; }
- virtual JZEvent* EqualizerMacroSX( long clk, unsigned char val ) { return 0; }
+ virtual JZEvent* EqualizerMacroSX( long clk, unsigned char val )
+ {
+ return 0;
+ }
protected:
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/Track.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -609,11 +609,20 @@
void SetState(int NewState);
void ToggleState(int Direction); // +1 = next, -1 = prev
- int GetChannel() { return Channel; }
+ int GetChannel()
+ {
+ return Channel;
+ }
void SetChannel(int NewChannel);
- int GetDevice() const { return Device; }
- void SetDevice(int d) { Device = d; }
+ int GetDevice() const
+ {
+ return Device;
+ }
+ void SetDevice(int d)
+ {
+ Device = d;
+ }
int GetPatch();
void SetPatch(int PatchNr);
Modified: trunk/jazz/src/gui/trackwinEnum.h
===================================================================
--- trunk/jazz/src/gui/trackwinEnum.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/gui/trackwinEnum.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -20,7 +20,8 @@
**
*/
-enum {
+enum
+{
MEN_LOAD =1,
MEN_SAVE =2,
MEN_QUIT =3,
@@ -125,4 +126,3 @@
MEN_SELECTIONSUB=107,
MEN_PIANOWIN2=108
};
-
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-04-28 23:14:07 UTC (rev 775)
@@ -578,10 +578,12 @@
DWORD dwParam2
)
{
- if (wMsg == MOM_DONE) {
+ if (wMsg == MOM_DONE)
+ {
MIDIHDR *hdr = (MIDIHDR *)dwParam1;
tWinSysexBuffer *buf = (tWinSysexBuffer *)hdr->dwUser;
- if (buf != 0) { // ignore OutNow() buffers
+ if (buf != 0)
+ { // ignore OutNow() buffers
buf->Release();
OutputDebugString("release\n");
}
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h 2010-04-28 21:36:26 UTC (rev 774)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h 2010-04-28 23:14:07 UTC (rev 775)
@@ -270,7 +270,8 @@
wr = (wr + 1) % MIDI_BUFFER_SIZE;
}
- int empty() const {
+ int empty() const
+ {
return rd == wr;
}
Modified: trunk/jazz/src/ms...
[truncated message content] |
|
From: <pst...@us...> - 2010-04-28 21:36:32
|
Revision: 774
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=774&view=rev
Author: pstieber
Date: 2010-04-28 21:36:26 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
1. Changed switch( to switch (.
2. Changed for( to for (.
3. Changed the style in wxPropertyValue::StringValue.
4. Changed the curly bracket style in prop.cpp.
Modified Paths:
--------------
trunk/jazz/src/DeprecatedWx/prop.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/DeprecatedWx/prop.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/prop.cpp 2010-04-28 21:32:14 UTC (rev 773)
+++ trunk/jazz/src/DeprecatedWx/prop.cpp 2010-04-28 21:36:26 UTC (rev 774)
@@ -896,13 +896,15 @@
return m_value.boolPtr;
}
-wxChar *wxPropertyValue::StringValue(void) const {
- if (m_type == wxPropertyValueString)
- return m_value.string;
- else if (m_type == wxPropertyValueStringPtr)
- return *(m_value.stringPtr);
- else return NULL;
- }
+wxChar *wxPropertyValue::StringValue(void) const
+{
+ if (m_type == wxPropertyValueString)
+ return m_value.string;
+ else if (m_type == wxPropertyValueStringPtr)
+ return *(m_value.stringPtr);
+ else
+ return NULL;
+}
wxChar **wxPropertyValue::StringValuePtr(void) const
{
@@ -1107,10 +1109,13 @@
bool wxPropertySheet::SetProperty(const wxString& Name, const wxPropertyValue& value)
{
wxProperty* prop = GetProperty(Name);
- if(prop){
+ if (prop)
+ {
prop->SetValue(value);
return true;
- }else{
+ }
+ else
+ {
return false;
}
}
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-04-28 21:32:14 UTC (rev 773)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2010-04-28 21:36:26 UTC (rev 774)
@@ -160,7 +160,7 @@
now = (long)timeGetTime();
- switch(wMsg)
+ switch (wMsg)
{
case MIM_DATA:
// ignore active sensing and real time messages except midi stop
@@ -271,7 +271,7 @@
now = (long)timeGetTime();
- switch(wMsg)
+ switch (wMsg)
{
case MIM_DATA:
if ( dwParam1 == 0xf8 )
@@ -399,7 +399,7 @@
now = (long)timeGetTime();
- switch(wMsg)
+ switch (wMsg)
{
case MIM_DATA:
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2010-04-28 21:32:14 UTC (rev 773)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2010-04-28 21:36:26 UTC (rev 774)
@@ -214,7 +214,7 @@
JZEvent* pEvent = 0;
- switch(u.c[0] & 0xf0)
+ switch (u.c[0] & 0xf0)
{
case 0x80:
pEvent = new JZKeyOffEvent(0, u.c[0] & 0x0f, u.c[1]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 21:32:21
|
Revision: 773
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=773&view=rev
Author: pstieber
Date: 2010-04-28 21:32:14 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Started updating the menus in the sample window.
Modified Paths:
--------------
trunk/jazz/src/Resources.h
trunk/jazz/src/SampleWindow.cpp
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2010-04-28 16:27:52 UTC (rev 772)
+++ trunk/jazz/src/Resources.h 2010-04-28 21:32:14 UTC (rev 773)
@@ -37,6 +37,8 @@
#define ID_SETTINGS_SYNTHESIZER wxID_HIGHEST + 11
#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
+#define ID_EDIT_PASTE_MERGE wxID_HIGHEST + 15
+
#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
#define ID_AUDIO_SAMPLE_SETTINGS wxID_HIGHEST + 21
#define ID_AUDIO_LOAD_SAMPLE_SET wxID_HIGHEST + 22
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-04-28 16:27:52 UTC (rev 772)
+++ trunk/jazz/src/SampleWindow.cpp 2010-04-28 21:32:14 UTC (rev 773)
@@ -29,6 +29,7 @@
#include "Mapper.h"
#include "MouseAction.h"
#include "Player.h"
+#include "Resources.h"
#include "Rhythm.h"
#include "Sample.h"
#include "SampleCommand.h"
@@ -52,10 +53,6 @@
#define MEN_SAVEAS 6
#define MEN_REVERT 7
-#define MEN_PASTE 12
-#define MEN_PASTE_MIX 15
-
-
#define MEN_VOLUME_MAX 19
#define MEN_VOLUME_PNT 20
@@ -78,7 +75,6 @@
#define MEN_REVERB 47
#define MEN_SHIFTER 48
#define MEN_REVERSE 49
-#define MEN_SETTINGS 50
#define MEN_FILTER 51
#define MEN_CHORUS 52
#define MEN_STEREO 53
@@ -90,13 +86,17 @@
class tSamplePlayPosition;
-class tInsertionPoint {
+class tInsertionPoint
+{
public:
- tInsertionPoint(wxScrolledWindow *c) : cnvs(c)
+
+ tInsertionPoint(wxScrolledWindow *c)
+ : cnvs(c)
{
last_x = 0;
visible = 0;
- };
+ }
+
void Draw(int x)
{
last_x = x;
@@ -110,53 +110,75 @@
dc->SetPen(*wxBLACK_PEN);
dc->SetLogicalFunction(wxCOPY);
}
+
void Draw()
{
Draw(last_x);
}
- int IsVisible() const {
+
+ int IsVisible() const
+ {
return visible;
}
- float GetX() const {
+
+ float GetX() const
+ {
return last_x;
}
+
private:
+
int last_x;
int visible;
wxScrolledWindow *cnvs;
};
-
-
class tSampleCnvs : public wxScrolledWindow
{
friend class tSampleWin;
friend class tSmplWinSettingsForm;
+
public:
+
tSampleCnvs(tSampleWin *win, tSample &sample);
+
virtual ~tSampleCnvs();
+
void Redraw()
{
OnPaint();
}
+
virtual void OnPaint();
+
virtual void OnSize(int w, int h);
+
virtual void OnEvent(wxMouseEvent& MouseEvent);
+
void ClearSelection();
+
void SetInsertionPoint(int offs);
+
void SetSelection(int fr, int to);
int Sample2Pixel(int sample);
+
int Pixel2Sample(float pixel);
+
void Play();
+ private:
+ void DrawSample(int channel, int x, int y, int w, int h);
+
+ void DrawTicks(int x, int y, int w);
+
private:
- void DrawSample(int channel, int x, int y, int w, int h);
+
tSampleWin *win;
+
tSample &spl;
- void DrawTicks(int x, int y, int w);
int paint_offset;
int paint_length;
@@ -217,8 +239,11 @@
class tSamplePlayPosition : public wxTimer
{
public:
+
tSamplePlayPosition(tSampleCnvs &c, JZPlayer *p, tSample &s)
- : cnvs(c), player(p), spl(s)
+ : cnvs(c),
+ player(p),
+ spl(s)
{
visible = FALSE;
x = 0;
@@ -703,7 +728,7 @@
in_constructor = TRUE;
cnvs = 0;
- mpToolBar = 0;
+ mpToolBar = 0;
scrol_panel = 0;
pos_scrol = 0;
zoom_scrol = 0;
@@ -727,64 +752,73 @@
mpToolBar = new JZToolBar(this, tdefs);
- wxMenuBar *menu_bar = new wxMenuBar;
- wxMenu *menu = new wxMenu;
- menu->Append(MEN_REVERT, "&Revert to Saved");
- menu->Append(MEN_LOAD, "&Load...");
- menu->Append(wxID_SAVE, "&Save");
- menu->Append(wxID_SAVEAS, "&Save As...");
- menu->Append(MEN_CLOSE, "&Close");
- menu_bar->Append(menu, "&File");
+ // Create a menu bar, the various menus with entries, and attach them to the
+ // menu bar.
- menu = new wxMenu;
- menu->Append(wxID_CUT, "&Cut");
- menu->Append(wxID_COPY, "Co&py");
+ wxMenu* pMenu = 0;
+ wxMenu* pSubMenu = 0;
+ wxMenuBar* pMenuBar = new wxMenuBar;
- menu->Append(MEN_PASTE, "&Paste");
- menu->Append(MEN_PASTE_MIX, "Paste &Merge");
- wxMenu *sub = new wxMenu;
- sub->Append(MEN_SILENCE_OVR, "&Replace");
- sub->Append(MEN_SILENCE_INS, "&Insert");
- sub->Append(MEN_SILENCE_APP, "&Append");
- menu->Append(MEN_SILENCE, "&Silence", sub);
- sub = new wxMenu;
- sub->Append(MEN_FLIP_LEFT, "Left");
- sub->Append(MEN_FLIP_RIGHT, "Right");
- menu->Append(MEN_FLIP, "In&vert Phase", sub);
- menu->Append(MEN_VOLUME_MAX, "&Maximize Volume");
- menu_bar->Append(menu, "&Edit");
+ // Create and populate the File menu.
+ pMenu = new wxMenu;
- menu = new wxMenu;
- menu->Append(MEN_VOLUME_PNT, "&Volume...");
- menu->Append(MEN_PAN_PNT, "&Panpot...");
- menu->Append(MEN_TRANSP_PNT, "&Pitch...");
- menu->Append(MEN_WAHWAH, "&Filter...");
- menu->Append(MEN_CANCEL, "&None...");
- menu_bar->Append(menu, "&Painters");
+ pMenu->Append(MEN_REVERT, "&Revert to Saved");
+ pMenu->Append(MEN_LOAD, "&Load...");
+ pMenu->Append(wxID_SAVE, "&Save");
+ pMenu->Append(wxID_SAVEAS, "&Save As...");
+ pMenu->Append(MEN_CLOSE, "&Close");
- menu = new wxMenu;
- menu->Append(MEN_EQUALIZER, "&Equalizer...");
- menu->Append(MEN_FILTER, "&Filter...");
- menu->Append(MEN_DISTORTION, "&Distortion...");
- menu->Append(MEN_REVERB, "&Reverb...");
- menu->Append(MEN_ECHO, "&Echo...");
- menu->Append(MEN_CHORUS, "&Chorus...");
- menu->Append(MEN_SHIFTER, "&Pitch shifter...");
- menu->Append(MEN_STRETCHER, "&Time stretcher...");
- menu->Append(MEN_REVERSE, "Re&verse");
- menu->Append(MEN_SYNTH, "&Synth...");
- menu_bar->Append(menu, "&Effects");
+ pMenuBar->Append(pMenu, "&File");
- menu = new wxMenu;
- menu->Append(MEN_TRANSP_SET, "&Pitch Painter...");
- menu->Append(MEN_WAHSETTINGS, "&Filter Painter...");
-// menu->Append(wxID_ZOOM_IN, "Zoom &In");
-// menu->Append(wxID_ZOOM_OUT, "Zoom &Out");
- menu->Append(MEN_SETTINGS, "&View Settings...");
- menu_bar->Append(menu, "&Settings");
+ // Create and populate the Edit menu.
+ pMenu = new wxMenu;
+ pMenu->Append(wxID_CUT, "&Cut");
+ pMenu->Append(wxID_COPY, "Co&py");
+ pMenu->Append(wxID_PASTE, "&Paste");
+ pMenu->Append(ID_EDIT_PASTE_MERGE, "Paste &Merge");
+ pSubMenu = new wxMenu;
+ pSubMenu->Append(MEN_SILENCE_OVR, "&Replace");
+ pSubMenu->Append(MEN_SILENCE_INS, "&Insert");
+ pSubMenu->Append(MEN_SILENCE_APP, "&Append");
+ pMenu->Append(MEN_SILENCE, "&Silence", pSubMenu);
+ pSubMenu = new wxMenu;
+ pSubMenu->Append(MEN_FLIP_LEFT, "Left");
+ pSubMenu->Append(MEN_FLIP_RIGHT, "Right");
+ pMenu->Append(MEN_FLIP, "In&vert Phase", pSubMenu);
+ pMenu->Append(MEN_VOLUME_MAX, "&Maximize Volume");
+ pMenuBar->Append(pMenu, "&Edit");
- SetMenuBar(menu_bar);
+ pMenu = new wxMenu;
+ pMenu->Append(MEN_VOLUME_PNT, "&Volume...");
+ pMenu->Append(MEN_PAN_PNT, "&Panpot...");
+ pMenu->Append(MEN_TRANSP_PNT, "&Pitch...");
+ pMenu->Append(MEN_WAHWAH, "&Filter...");
+ pMenu->Append(MEN_CANCEL, "&None...");
+ pMenuBar->Append(pMenu, "&Painters");
+ pMenu = new wxMenu;
+ pMenu->Append(MEN_EQUALIZER, "&Equalizer...");
+ pMenu->Append(MEN_FILTER, "&Filter...");
+ pMenu->Append(MEN_DISTORTION, "&Distortion...");
+ pMenu->Append(MEN_REVERB, "&Reverb...");
+ pMenu->Append(MEN_ECHO, "&Echo...");
+ pMenu->Append(MEN_CHORUS, "&Chorus...");
+ pMenu->Append(MEN_SHIFTER, "&Pitch shifter...");
+ pMenu->Append(MEN_STRETCHER, "&Time stretcher...");
+ pMenu->Append(MEN_REVERSE, "Re&verse");
+ pMenu->Append(MEN_SYNTH, "&Synth...");
+ pMenuBar->Append(pMenu, "&Effects");
+
+ pMenu = new wxMenu;
+ pMenu->Append(MEN_TRANSP_SET, "&Pitch Painter...");
+ pMenu->Append(MEN_WAHSETTINGS, "&Filter Painter...");
+// pMenu->Append(wxID_ZOOM_IN, "Zoom &In");
+// pMenu->Append(wxID_ZOOM_OUT, "Zoom &Out");
+ pMenu->Append(MEN_SETTINGS, "&View Settings...");
+ pMenuBar->Append(pMenu, "&Settings");
+
+ SetMenuBar(pMenuBar);
+
// construct a panel containing the scrollbars
cnvs = new tSampleCnvs(this, spl);
scrol_panel = new wxPanel(this);
@@ -1220,7 +1254,7 @@
on_accept = new tCommandPainter(*this, pan_command);
break;
- case MEN_PASTE_MIX:
+ case ID_EDIT_PASTE_MERGE:
{
int offs;
if (HaveInsertionPoint(offs))
@@ -1232,7 +1266,7 @@
}
break;
- case MEN_PASTE:
+ case wxID_PASTE:
{
int offs, fr, to;
if (HaveInsertionPoint(offs, FALSE))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 16:27:58
|
Revision: 772
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=772&view=rev
Author: pstieber
Date: 2010-04-28 16:27:52 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Added missing class scope qualifiers.
Modified Paths:
--------------
trunk/jazz/src/TrackFrame.cpp
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2010-04-28 16:24:34 UTC (rev 771)
+++ trunk/jazz/src/TrackFrame.cpp 2010-04-28 16:27:52 UTC (rev 772)
@@ -113,11 +113,11 @@
EVT_MENU(ID_AUDIO_LOAD_SAMPLE_SET, JZTrackFrame::OnAudioLoadSampleSet)
- EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET, OnAudioSaveSampleSet)
+ EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET, JZTrackFrame::OnAudioSaveSampleSet)
- EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET_AS, OnAudioSaveSampleSetAs)
+ EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET_AS, JZTrackFrame::OnAudioSaveSampleSetAs)
- EVT_MENU(ID_AUDIO_NEW_SAMPLE_SET, OnAudioNewSampleSet)
+ EVT_MENU(ID_AUDIO_NEW_SAMPLE_SET, JZTrackFrame::OnAudioNewSampleSet)
EVT_MENU(wxID_HELP_CONTENTS, JZTrackFrame::OnHelpContents)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 16:24:40
|
Revision: 771
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=771&view=rev
Author: pstieber
Date: 2010-04-28 16:24:34 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Updated include files for the Linux build.
Modified Paths:
--------------
trunk/jazz/src/Player.cpp
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2010-04-28 14:15:35 UTC (rev 770)
+++ trunk/jazz/src/Player.cpp 2010-04-28 16:24:34 UTC (rev 771)
@@ -37,8 +37,8 @@
//#include <unistd.h>
#include <cassert>
#include <cstdlib>
-
-#include <string.h>
+#include <cstring>
+#include <iostream>
#include <errno.h>
#ifndef _MSC_VER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-28 14:15:41
|
Revision: 770
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=770&view=rev
Author: pstieber
Date: 2010-04-28 14:15:35 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Hooked up Audio menu entries.
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/Project.cpp
trunk/jazz/src/Project.h
trunk/jazz/src/Resources.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Audio.cpp 2010-04-28 14:15:35 UTC (rev 770)
@@ -188,7 +188,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
tSampleSet::tSampleSet(long tpm)
- : mDefaultFileName("noname.spl"),
+ : speed(22050),
+ channels(1),
+ bits(16), // dont change!!
+ softsync(1),
+ mpGlobalSettingsDialog(0),
+ mpSampleDialog(0),
+ mDefaultFileName("noname.spl"),
mRecordFileName("noname.wav")
{
int i;
@@ -202,20 +208,14 @@
adjust_audio_length = 1;
has_changed = false;
- spl_dialog = 0;
- mpGlobalSettingsDialog = 0;
is_playing = 0;
- softsync = 1;
dirty = 0;
for (i = 0; i < MAXSMPL; i++)
{
- samples[i] = new tSample(*this);
- samplewin[i] = 0;
+ mSamples[i] = new tSample(*this);
+ mSampleWindows[i] = 0;
}
- speed = 22050;
- channels = 1;
- bits = 16; // dont change!!
for (i = 0; i < MAXPOLY; i++)
{
@@ -231,8 +231,8 @@
int i;
for (i = 0; i < MAXSMPL; i++)
{
- delete samples[i];
- delete samplewin[i];
+ delete mSamples[i];
+ delete mSampleWindows[i];
}
for (i = 0; i < MAXPOLY; i++)
{
@@ -248,14 +248,17 @@
//-----------------------------------------------------------------------------
void tSampleSet::Edit(int key)
{
- if (samplewin[key] == 0)
+ if (mSampleWindows[key] == 0)
{
- tSample* spl = samples[key];
+ tSample* spl = mSamples[key];
- samplewin[key] = new tSampleWin(gpTrackWindow, &samplewin[key], *spl);
+ mSampleWindows[key] = new tSampleWin(
+ gpTrackWindow,
+ &mSampleWindows[key],
+ *spl);
}
- samplewin[key]->Show(true);
- samplewin[key]->Redraw();
+ mSampleWindows[key]->Show(true);
+ mSampleWindows[key]->Redraw();
}
//-----------------------------------------------------------------------------
@@ -279,7 +282,7 @@
wxBeginBusyCursor();
for (int i = 0; i < MAXSMPL; i++)
{
- samples[i]->Clear();
+ mSamples[i]->Clear();
}
// Get the path of the sample file.
@@ -317,23 +320,23 @@
continue;
}
assert(0 <= key && key < MAXSMPL);
- samples[key]->SetFilename(SplFilePath.c_str());
- samples[key]->SetLabel(Label.c_str());
- samples[key]->SetVolume(vol);
- samples[key]->SetPan(pan);
- samples[key]->SetPitch(pitch);
- if (samples[key]->Load())
+ mSamples[key]->SetFilename(SplFilePath.c_str());
+ mSamples[key]->SetLabel(Label.c_str());
+ mSamples[key]->SetVolume(vol);
+ mSamples[key]->SetPan(pan);
+ mSamples[key]->SetPitch(pitch);
+ if (mSamples[key]->Load())
{
wxString String;
String
<< "Could not load: \""
- << samples[key]->GetFilename()
+ << mSamples[key]->GetFilename()
<< '"';
::wxMessageBox(String, "Error", wxOK);
}
- if (samplewin[key])
+ if (mSampleWindows[key])
{
- samplewin[key]->Redraw();
+ mSampleWindows[key]->Redraw();
}
}
wxEndBusyCursor();
@@ -346,7 +349,9 @@
void tSampleSet::ReloadSamples()
{
for (int i = 0; i < MAXSMPL; i++)
- samples[i]->Load(dirty);
+ {
+ mSamples[i]->Load(dirty);
+ }
dirty = 0;
}
@@ -358,7 +363,7 @@
os << 1 << " " << speed << " " << channels << " " << softsync << endl;
for (int i = 0; i < MAXSMPL; i++)
{
- tSample *spl = samples[i];
+ tSample *spl = mSamples[i];
const char *fname = spl->GetFilename();
const char* pLabel = spl->GetLabel();
int vol = spl->GetVolume();
@@ -382,7 +387,7 @@
{
if (0 <= i && i < MAXSMPL)
{
- return samples[i]->GetLabel();
+ return mSamples[i]->GetLabel();
}
return "";
}
@@ -468,7 +473,9 @@
JZKeyOnEvent* pKeyOn = e->IsKeyOn();
if (pKeyOn && num_voices < MAXPOLY)
{
- voices[num_voices++]->Start(samples[pKeyOn->GetKey()], pKeyOn->GetClock());
+ voices[num_voices++]->Start(
+ mSamples[pKeyOn->GetKey()],
+ pKeyOn->GetClock());
}
}
@@ -542,7 +549,7 @@
//-----------------------------------------------------------------------------
int tSampleSet::PrepareListen(int key, long fr_smpl, long to_smpl)
{
- tSample *spl = samples[key];
+ tSample *spl = mSamples[key];
return PrepareListen(spl, fr_smpl, to_smpl);
}
@@ -585,7 +592,7 @@
if (pKeyOn)
{
pKeyOn->SetLength(
- (int)Samples2Ticks(samples[pKeyOn->GetKey()]->GetLength()));
+ (int)Samples2Ticks(mSamples[pKeyOn->GetKey()]->GetLength()));
// Is the event visble?
if (pKeyOn->GetEventLength() < 15)
@@ -606,7 +613,7 @@
// touch all playback sample data, so they may get swapped into memory
for (int i = 0; i < MAXSMPL; i++)
{
- tSample *spl = samples[i];
+ tSample *spl = mSamples[i];
spl->GotoRAM();
}
@@ -627,9 +634,13 @@
class tSamplesDlg : public wxDialog
{
friend class tSampleSet;
+
public:
- tSamplesDlg(wxWindow* pParent, tSampleSet &set);
+
+ tSamplesDlg(wxWindow* pParent, tSampleSet& SampleSet);
+
~tSamplesDlg();
+
#ifdef OBSOLETE
static void CloseButton(wxItem &item, wxCommandEvent& event);
static void PlayButton(wxItem &item, wxCommandEvent& event);
@@ -639,6 +650,7 @@
static void HelpButton(wxItem &item, wxCommandEvent& event);
static void ListClick(wxItem &item, wxCommandEvent& event);
#endif // OBSOLETE
+
void OnCloseButton();
void OnPlayButton();
void OnEditButton();
@@ -648,13 +660,13 @@
void OnListClick();
private:
+
tSampleSet &set;
- char **names;
- wxListBox *list;
- wxSlider *pan;
- wxSlider *vol;
- wxSlider *pitch;
+ wxListBox* mpListBox;
+ wxSlider* mpPanSlider;
+ wxSlider* mpVolumeSlider;
+ wxSlider* mpPitchSlider;
#ifdef OBSOLETE
wxText* pLabel;
wxText* pFile;
@@ -805,9 +817,9 @@
//-----------------------------------------------------------------------------
void tSampleSet::EditAudioGlobalSettings(wxWindow* pParent)
{
- if (spl_dialog)
+ if (mpSampleDialog)
{
- spl_dialog->Show(true);
+ mpSampleDialog->Show(true);
return;
}
@@ -825,6 +837,77 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void tSampleSet::EditAudioSamples(wxWindow* pParent)
+{
+ SamplesDlg();
+}
+
+//-----------------------------------------------------------------------------
+// case ID_AUDIO_LOAD_SAMPLE_SET:
+//-----------------------------------------------------------------------------
+void tSampleSet::LoadSampleSet(wxWindow* pParent)
+{
+ wxString fname = file_selector(
+ mDefaultFileName,
+ "Load Sample Set",
+ false,
+ has_changed,
+ "*.spl");
+ if (fname)
+ {
+ Load(fname);
+ }
+}
+
+//-----------------------------------------------------------------------------
+// case ID_AUDIO_SAVE_SAMPLE_SET_AS:
+//-----------------------------------------------------------------------------
+void tSampleSet::SaveSampleSetAs(wxWindow* pParent)
+{
+ wxString fname = file_selector(
+ mDefaultFileName,
+ "Save Sample Set",
+ true,
+ has_changed,
+ "*.spl");
+ if (fname)
+ {
+ Save(fname);
+ }
+}
+
+//-----------------------------------------------------------------------------
+// case ID_AUDIO_SAVE_SAMPLE_SET:
+//-----------------------------------------------------------------------------
+void tSampleSet::SaveSampleSet(wxWindow* pParent)
+{
+ if (mDefaultFileName == "noname.spl")
+ {
+ return SaveSampleSetAs(pParent);
+ }
+ Save(mDefaultFileName);
+}
+
+//-----------------------------------------------------------------------------
+// case ID_AUDIO_NEW_SAMPLE_SET:
+//-----------------------------------------------------------------------------
+void tSampleSet::ClearSampleSet(wxWindow* pParent)
+{
+ if (mpSampleDialog == 0 && mpGlobalSettingsDialog == 0)
+ {
+ if (wxMessageBox("Clear Sample Set?", "Confirm", wxYES_NO) == wxNO)
+ {
+ return;
+ }
+ for (int i = 0; i < MAXSMPL; ++i)
+ {
+ mSamples[i]->Clear();
+ }
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tSampleSet::SaveRecordingDlg(long frc, long toc, tAudioRecordBuffer &buf)
{
if (frc >= toc)
@@ -870,7 +953,7 @@
// see if fname is already present in sample list
for (i = 0; i < MAXSMPL; i++)
{
- spl = samples[i];
+ spl = mSamples[i];
if (strcmp(spl->GetFilename(), fname) == 0)
break;
}
@@ -881,7 +964,7 @@
// start somewhere near the top of the list
for (i = 15; i < MAXSMPL; i++)
{
- spl = samples[i];
+ spl = mSamples[i];
if (spl->GetFilename()[0] == 0)
break;
}
@@ -1044,12 +1127,14 @@
set(s)
{
if (path == 0)
+ {
path = copystring("*.wav");
+ }
- names = new char * [tSampleSet::MAXSMPL];
+ wxArrayString SampleNames;
for (int i = 0; i < tSampleSet::MAXSMPL; i++)
{
- names[i] = ListEntry(i);
+ SampleNames.Add(ListEntry(i));
}
// buttons
@@ -1067,29 +1152,31 @@
// list box
int y = 80;
SetLabelPosition(wxVERTICAL);
- list = new wxListBox(this, (wxFunction)ListClick, "Samples", wxLB_SINGLE, 10, y, 300, 200, tSampleSet::MAXSMPL, names, wxNEEDED_SB);
+#endif // OBSOLETE
- NewLine();
+ mpListBox = new wxListBox(
+ this,
+ wxID_ANY,
+ wxDefaultPosition,
+ wxDefaultSize,
+ SampleNames,
+ wxLB_SINGLE);
+
+#ifdef OBSOLETE
SetLabelPosition(wxHORIZONTAL);
+#endif // OBSOLETE
// Sliders
- vol = new wxSlider(this, (wxFunction)0, " ", 64, 0, 127, 200);
- (void) new wxMessage(this, "Volume");
- NewLine();
- pan = new wxSlider(this, (wxFunction)0, " ", 0, -63, 63, 200);
- (void) new wxMessage(this, "Panpot");
- NewLine();
- pitch = new wxSlider(this, (wxFunction)0, " ", 0, -12, 12, 200);
- (void) new wxMessage(this, "Pitch");
- NewLine();
+ mpVolumeSlider = new wxSlider(this, wxID_ANY, 64, 0, 127);
+ mpPanSlider = new wxSlider(this, wxID_ANY, 0, -63, 63);
+ mpPitchSlider = new wxSlider(this, wxID_ANY, 0, -12, 12);
+#ifdef OBSOLETE
pLabel = new wxText(this, (wxFunction)0, "Label", "", -1, -1, 300);
- NewLine();
file = new wxText(this, (wxFunction)0, "File", "", -1, -1, 300);
- NewLine();
#endif // OBSOLETE
Fit();
Sample2Win(current);
- list->SetSelection(current, true);
+ mpListBox->SetSelection(current);
Show(true);
}
@@ -1098,7 +1185,7 @@
char *tSamplesDlg::ListEntry(int i)
{
ostringstream Oss;
- Oss << i + 1 << ' ' << set.samples[i]->GetLabel();
+ Oss << i + 1 << ' ' << set.mSamples[i]->GetLabel();
// KeyToString(i, buf + strlen(buf));
return copystring(Oss.str().c_str());
}
@@ -1107,10 +1194,10 @@
//-----------------------------------------------------------------------------
void tSamplesDlg::Sample2Win(int i)
{
- tSample *spl = set.samples[i];
- vol->SetValue(spl->GetVolume());
- pitch->SetValue(spl->GetPitch());
- pan->SetValue(spl->GetPan());
+ tSample *spl = set.mSamples[i];
+ mpVolumeSlider->SetValue(spl->GetVolume());
+ mpPitchSlider->SetValue(spl->GetPitch());
+ mpPanSlider->SetValue(spl->GetPan());
#ifdef OBSOLETE
pLabel->SetValue((char *)spl->GetLabel());
file->SetValue((char *)spl->GetFilename());
@@ -1121,10 +1208,10 @@
//-----------------------------------------------------------------------------
void tSamplesDlg::Win2Sample(int i)
{
- tSample *spl = set.samples[i];
- spl->SetPitch(pitch->GetValue());
- spl->SetVolume(vol->GetValue());
- spl->SetPan(pan->GetValue());
+ tSample *spl = set.mSamples[i];
+ spl->SetPitch(mpPitchSlider->GetValue());
+ spl->SetVolume(mpVolumeSlider->GetValue());
+ spl->SetPan(mpPanSlider->GetValue());
#ifdef OBSOLETE
spl->SetLabel(pLabel->GetValue());
spl->SetFilename(file->GetValue());
@@ -1138,8 +1225,8 @@
if (i >= 0)
{
current = i;
- list->SetString(current, ListEntry(current));
- list->SetSelection(current, true);
+ mpListBox->SetString(current, ListEntry(current));
+ mpListBox->SetSelection(current, true);
}
}
@@ -1147,9 +1234,6 @@
//-----------------------------------------------------------------------------
tSamplesDlg::~tSamplesDlg()
{
- for (int i = 0; i < tSampleSet::MAXSMPL; i++)
- delete [] names[i];
- delete [] names;
}
//-----------------------------------------------------------------------------
@@ -1162,7 +1246,7 @@
wxBeginBusyCursor();
set.ReloadSamples();
wxEndBusyCursor();
- set.spl_dialog = 0;
+ set.mpSampleDialog = 0;
// DELETE_THIS();
Destroy();
}
@@ -1190,7 +1274,7 @@
wxBeginBusyCursor();
Win2Sample(current);
SetCurrentListEntry(current);
- tSample *spl = set.samples[current];
+ tSample *spl = set.mSamples[current];
spl->Load();
wxEndBusyCursor();
@@ -1212,7 +1296,7 @@
}
Win2Sample(current);
SetCurrentListEntry(current);
- tSample *spl = set.samples[current];
+ tSample *spl = set.mSamples[current];
wxBeginBusyCursor();
spl->Load();
gpMidiPlayer->ListenAudio(current);
@@ -1223,7 +1307,7 @@
//-----------------------------------------------------------------------------
void tSamplesDlg::OnClrButton()
{
- tSample *spl = set.samples[current];
+ tSample *spl = set.mSamples[current];
spl->Clear();
SetCurrentListEntry(current);
Sample2Win(current);
@@ -1241,7 +1325,7 @@
void tSamplesDlg::OnListClick()
{
Win2Sample(current);
- int i = list->GetSelection();
+ int i = mpListBox->GetSelection();
if (i >= 0)
{
current = i;
@@ -1291,87 +1375,19 @@
mpGlobalSettingsDialog->Show(true);
return;
}
- if (spl_dialog == 0)
- spl_dialog = new tSamplesDlg(gpTrackWindow, *this);
- spl_dialog->Show(true);
+ if (mpSampleDialog == 0)
+ {
+ mpSampleDialog = new tSamplesDlg(gpTrackWindow, *this);
+ }
+ mpSampleDialog->Show(true);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void tSampleSet::RefreshDialogs()
{
- if (spl_dialog)
- spl_dialog->Sample2Win(spl_dialog->current);
-}
-
-// -----------------------------------------------------------------
-// -------------------------------- menu ---------------------------
-// -----------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-int tSampleSet::OnMenuCommand(int id)
-{
- switch (id)
+ if (mpSampleDialog)
{
- case ID_AUDIO_LOAD:
- {
- wxString fname = file_selector(
- mDefaultFileName,
- "Load Sample Set",
- false,
- has_changed,
- "*.spl");
- if (fname)
- {
- Load(fname);
- }
- return 1;
- }
-
- case ID_AUDIO_SAVE_AS:
- {
- wxString fname = file_selector(
- mDefaultFileName,
- "Save Sample Set",
- true,
- has_changed,
- "*.spl");
- if (fname)
- {
- Save(fname);
- }
- return 1;
- }
-
- case ID_AUDIO_SAVE:
- {
- if (mDefaultFileName == "noname.spl")
- {
- return OnMenuCommand(ID_AUDIO_SAVE_AS);
- }
- Save(mDefaultFileName);
- return 1;
- }
-
- case ID_AUDIO_SAMPLES:
- SamplesDlg();
- return 1;
-
- case ID_AUDIO_NEW:
- if (spl_dialog == 0 && mpGlobalSettingsDialog == 0)
- {
- if (wxMessageBox("Clear Sample Set?", "Confirm", wxYES_NO) == wxNO)
- {
- return 1;
- }
- for (int i = 0; i < MAXSMPL; i++)
- {
- samples[i]->Clear();
- }
- }
- return 1;
-
+ mpSampleDialog->Sample2Win(mpSampleDialog->current);
}
- return 0;
}
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Audio.h 2010-04-28 14:15:35 UTC (rev 770)
@@ -340,8 +340,6 @@
virtual const char *GetSampleName(int i);
- int OnMenuCommand(int id);
-
void StartPlay(long clock);
void StopPlay();
@@ -367,11 +365,21 @@
tSample &operator[](int i)
{
- return *samples[i];
+ return *mSamples[i];
}
void EditAudioGlobalSettings(wxWindow* pParent);
+ void EditAudioSamples(wxWindow* pParent);
+
+ void LoadSampleSet(wxWindow* pParent);
+
+ void SaveSampleSetAs(wxWindow* pParent);
+
+ void SaveSampleSet(wxWindow* pParent);
+
+ void ClearSampleSet(wxWindow* pParent);
+
protected:
long SampleSize(long num_samples)
@@ -388,20 +396,24 @@
protected:
- long speed; // samples / second
- int channels; // mono = 1, stereo = 2
- int bits; // must be 16!
- bool softsync; // enable software midi/audio sync
- enum { MAXSMPL = 128 };
- tSample *samples[MAXSMPL];
- tSampleWin *samplewin[MAXSMPL];
+ long speed; // samples / second
+ int channels; // mono = 1, stereo = 2
+ int bits; // must be 16!
+ bool softsync; // enable software midi/audio sync
- long ticks_per_minute; // midi speed for audio/midi sync
- double clocks_per_buffer;
- long start_clock; // when did play start
+ enum
+ {
+ MAXSMPL = 128
+ };
+ tSample* mSamples[MAXSMPL];
+ tSampleWin* mSampleWindows[MAXSMPL];
- int event_index;
+ long ticks_per_minute; // midi speed for audio/midi sync
+ double clocks_per_buffer;
+ long start_clock; // when did play start
+ int event_index;
+
unsigned int bufbytes; // buffer size in byte
unsigned int bufshorts; // buffer size in short
tAudioBuffer *buffers[BUFCOUNT]; // all the audio buffers
@@ -413,7 +425,7 @@
long buffers_written; // for computing buffers clock
wxDialog* mpGlobalSettingsDialog;
- tSamplesDlg* spl_dialog;
+ tSamplesDlg* mpSampleDialog;
tEventArray* events;
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Player.cpp 2010-04-28 14:15:35 UTC (rev 770)
@@ -690,6 +690,41 @@
mSamples.EditAudioGlobalSettings(pParent);
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZPlayer::EditAudioSamples(wxWindow* pParent)
+{
+ mSamples.EditAudioSamples(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZPlayer::LoadSampleSet(wxWindow* pParent)
+{
+ mSamples.LoadSampleSet(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZPlayer::SaveSampleSetAs(wxWindow* pParent)
+{
+ mSamples.SaveSampleSetAs(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZPlayer::SaveSampleSet(wxWindow* pParent)
+{
+ mSamples.SaveSampleSet(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZPlayer::ClearSampleSet(wxWindow* pParent)
+{
+ mSamples.ClearSampleSet(pParent);
+}
+
#ifdef DEV_MPU401
//*****************************************************************************
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Player.h 2010-04-28 14:15:35 UTC (rev 770)
@@ -261,15 +261,6 @@
return 0;
}
- virtual int OnMenuCommand(int id)
- {
- if (mPlaying)
- {
- return 0;
- }
- return mSamples.OnMenuCommand(id);
- }
-
virtual const char *GetSampleName(int i)
{
return mSamples.GetSampleName(i);
@@ -283,6 +274,16 @@
void EditAudioGlobalSettings(wxWindow* pParent);
+ void EditAudioSamples(wxWindow* pParent);
+
+ void LoadSampleSet(wxWindow* pParent);
+
+ void SaveSampleSetAs(wxWindow* pParent);
+
+ void SaveSampleSet(wxWindow* pParent);
+
+ void ClearSampleSet(wxWindow* pParent);
+
void EditSample(int key)
{
mSamples.Edit(key);
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Project.cpp 2010-04-28 14:15:35 UTC (rev 770)
@@ -628,6 +628,41 @@
}
//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZProject::EditAudioSamples(wxWindow* pParent)
+{
+ mpMidiPlayer->EditAudioSamples(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZProject::LoadSampleSet(wxWindow* pParent)
+{
+ mpMidiPlayer->LoadSampleSet(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZProject::SaveSampleSetAs(wxWindow* pParent)
+{
+ mpMidiPlayer->SaveSampleSetAs(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZProject::SaveSampleSet(wxWindow* pParent)
+{
+ mpMidiPlayer->SaveSampleSet(pParent);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZProject::ClearSampleSet(wxWindow* pParent)
+{
+ mpMidiPlayer->ClearSampleSet(pParent);
+}
+
+//-----------------------------------------------------------------------------
// Description:
// Sets the internal mpRecInfo, used for recording apparently.
// JZProject will take ownership of this pointer, so don't delete it after
Modified: trunk/jazz/src/Project.h
===================================================================
--- trunk/jazz/src/Project.h 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Project.h 2010-04-28 14:15:35 UTC (rev 770)
@@ -158,6 +158,16 @@
void EditAudioGlobalSettings(wxWindow* pParent);
+ void EditAudioSamples(wxWindow* pParent);
+
+ void LoadSampleSet(wxWindow* pParent);
+
+ void SaveSampleSetAs(wxWindow* pParent);
+
+ void SaveSampleSet(wxWindow* pParent);
+
+ void ClearSampleSet(wxWindow* pParent);
+
JZPlayer* GetPlayer()
{
return mpMidiPlayer;
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/Resources.h 2010-04-28 14:15:35 UTC (rev 770)
@@ -38,11 +38,11 @@
#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
-#define ID_AUDIO_SAMPLES wxID_HIGHEST + 21
-#define ID_AUDIO_LOAD wxID_HIGHEST + 22
-#define ID_AUDIO_SAVE wxID_HIGHEST + 23
-#define ID_AUDIO_SAVE_AS wxID_HIGHEST + 24
-#define ID_AUDIO_NEW wxID_HIGHEST + 25
+#define ID_AUDIO_SAMPLE_SETTINGS wxID_HIGHEST + 21
+#define ID_AUDIO_LOAD_SAMPLE_SET wxID_HIGHEST + 22
+#define ID_AUDIO_SAVE_SAMPLE_SET wxID_HIGHEST + 23
+#define ID_AUDIO_SAVE_SAMPLE_SET_AS wxID_HIGHEST + 24
+#define ID_AUDIO_NEW_SAMPLE_SET wxID_HIGHEST + 25
#define ID_TRIM wxID_HIGHEST + 30
#define ID_QUANTIZE wxID_HIGHEST + 31
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/TrackFrame.cpp 2010-04-28 14:15:35 UTC (rev 770)
@@ -109,6 +109,16 @@
EVT_MENU(ID_AUDIO_GLOBAL_SETTINGS, JZTrackFrame::OnAudioGlobalSettings)
+ EVT_MENU(ID_AUDIO_SAMPLE_SETTINGS, JZTrackFrame::OnAudioSampleSettings)
+
+ EVT_MENU(ID_AUDIO_LOAD_SAMPLE_SET, JZTrackFrame::OnAudioLoadSampleSet)
+
+ EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET, OnAudioSaveSampleSet)
+
+ EVT_MENU(ID_AUDIO_SAVE_SAMPLE_SET_AS, OnAudioSaveSampleSetAs)
+
+ EVT_MENU(ID_AUDIO_NEW_SAMPLE_SET, OnAudioNewSampleSet)
+
EVT_MENU(wxID_HELP_CONTENTS, JZTrackFrame::OnHelpContents)
EVT_MENU(wxID_ABOUT, JZTrackFrame::OnHelpAbout)
@@ -380,6 +390,14 @@
pSettingMenu->Append(MEN_SAVE_SET, "&Save settings", save_settings_menu );
#endif
+ wxMenu* pAudioMenu = new wxMenu;
+ pAudioMenu->Append(ID_AUDIO_GLOBAL_SETTINGS, "&Global Audio Settings...");
+ pAudioMenu->Append(ID_AUDIO_SAMPLE_SETTINGS, "Sample Set Se&ttings... ");
+ pAudioMenu->Append(ID_AUDIO_LOAD_SAMPLE_SET, "&Load Sample Set...");
+ pAudioMenu->Append(ID_AUDIO_SAVE_SAMPLE_SET, "&Save Sample Set");
+ pAudioMenu->Append(ID_AUDIO_SAVE_SAMPLE_SET_AS, "Save Sample Set &As");
+ pAudioMenu->Append(ID_AUDIO_NEW_SAMPLE_SET, "&New Sample Set");
+
wxMenu* mpHelpMenu = new wxMenu;
mpHelpMenu->Append(wxID_HELP_CONTENTS, "&Contents");
// mpHelpMenu->Append(MEN_HELP_JAZZ, "&Jazz");
@@ -397,17 +415,7 @@
pMenuBar->Append(mpToolsMenu, "&Tools");
pMenuBar->Append(pSettingMenu, "&Settings");
pMenuBar->Append(pMiscMenu, "&Misc");
-
- wxMenu* pAudioMenu = new wxMenu;
- pAudioMenu->Append(ID_AUDIO_GLOBAL_SETTINGS, "&Global Settings...");
- pAudioMenu->Append(ID_AUDIO_SAMPLES, "Sample Se&ttings... ");
- pAudioMenu->Append(ID_AUDIO_LOAD, "&Load Set...");
- pAudioMenu->Append(ID_AUDIO_SAVE, "&Save Set");
- pAudioMenu->Append(ID_AUDIO_SAVE_AS, "Save Set &As");
- pAudioMenu->Append(ID_AUDIO_NEW, "&New Set");
-
pMenuBar->Append(pAudioMenu, "&Audio");
-
pMenuBar->Append(mpHelpMenu , "&Help");
SetMenuBar(pMenuBar);
@@ -647,6 +655,38 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioSampleSettings(wxCommandEvent& Event)
+{
+ mpProject->EditAudioSamples(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioLoadSampleSet(wxCommandEvent& Event)
+{
+ mpProject->LoadSampleSet(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioSaveSampleSet(wxCommandEvent& Event)
+{
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioSaveSampleSetAs(wxCommandEvent& Event)
+{
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioNewSampleSet(wxCommandEvent& Event)
+{
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnHelpContents(wxCommandEvent& Event)
{
::wxGetApp().DisplayHelpContents();
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2010-04-27 14:16:38 UTC (rev 769)
+++ trunk/jazz/src/TrackFrame.h 2010-04-28 14:15:35 UTC (rev 770)
@@ -100,6 +100,16 @@
void OnAudioGlobalSettings(wxCommandEvent& Event);
+ void OnAudioSampleSettings(wxCommandEvent& Event);
+
+ void OnAudioLoadSampleSet(wxCommandEvent& Event);
+
+ void OnAudioSaveSampleSet(wxCommandEvent& Event);
+
+ void OnAudioSaveSampleSetAs(wxCommandEvent& Event);
+
+ void OnAudioNewSampleSet(wxCommandEvent& Event);
+
void OnHelpContents(wxCommandEvent& Event);
void OnHelpAbout(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-27 14:16:44
|
Revision: 769
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=769&view=rev
Author: pstieber
Date: 2010-04-27 14:16:38 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Used #if 0 to remove the sequence length and MIDI delay dialogs.
This allowed the removal of the PropertyListDialog.h header :-)
Modified Paths:
--------------
trunk/jazz/src/Dialogs.h
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2010-04-27 14:15:09 UTC (rev 768)
+++ trunk/jazz/src/Dialogs.h 2010-04-27 14:16:38 UTC (rev 769)
@@ -23,16 +23,18 @@
#ifndef JZ_DIALOGS_H
#define JZ_DIALOGS_H
+#if 0
#include "CommandUtilities.h"
#include "PropertyListDialog.h"
+#endif
+//class JZFilter;
+class JZEvent;
+//class JZEventFrame;
+//class JZEventWindow;
class JZPianoWindow;
-class JZFilter;
-class JZSong;
-class JZEventFrame;
-class JZEventWindow;
+//class JZSong;
class JZTrack;
-class JZEvent;
//class tShiftDlg : public tPropertyListDlg
//{
@@ -68,6 +70,7 @@
// void OnHelp();
//};
+#if 0
// seqLength
class tSeqLengthDlg : public tPropertyListDlg
{
@@ -102,6 +105,7 @@
bool OnClose();
void OnHelp();
};
+#endif
void EventDialog(
JZEvent*,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
