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...> - 2012-11-29 21:23:49
|
Revision: 918
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=918&view=rev
Author: pstieber
Date: 2012-11-29 21:23:42 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Removed the obsolete truncateFilenames option.
Modified Paths:
--------------
trunk/jazz/src/HelpFiles/tex2rtf.ini
Modified: trunk/jazz/src/HelpFiles/tex2rtf.ini
===================================================================
--- trunk/jazz/src/HelpFiles/tex2rtf.ini 2012-11-29 21:22:38 UTC (rev 917)
+++ trunk/jazz/src/HelpFiles/tex2rtf.ini 2012-11-29 21:23:42 UTC (rev 918)
@@ -15,7 +15,6 @@
generateHPJ = no
htmlBrowseButtons = bitmap
winHelpTitle = "Jazz++ Help"
-truncateFilenames = no
combineSubSections = yes
htmlIndex = yes
htmlFrameContents = no
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 21:22:45
|
Revision: 917
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=917&view=rev
Author: pstieber
Date: 2012-11-29 21:22:38 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Added a VS 2010 filter file.
Added Paths:
-----------
trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters
Added: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters (rev 0)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters 2012-11-29 21:22:38 UTC (rev 917)
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\src\AsciiMidiFile.cpp" />
+ <ClCompile Include="..\src\Audio.cpp" />
+ <ClCompile Include="..\src\ClockDialog.cpp" />
+ <ClCompile Include="..\src\Command.cpp" />
+ <ClCompile Include="..\src\Configuration.cpp" />
+ <ClCompile Include="..\src\ControlEdit.cpp" />
+ <ClCompile Include="..\src\Dialogs.cpp" />
+ <ClCompile Include="..\src\DynamicArray.cpp" />
+ <ClCompile Include="..\src\ErrorMessage.cpp" />
+ <ClCompile Include="..\src\EventFrame.cpp" />
+ <ClCompile Include="..\src\Events.cpp" />
+ <ClCompile Include="..\src\EventWindow.cpp" />
+ <ClCompile Include="..\src\FileSelector.cpp" />
+ <ClCompile Include="..\src\Filter.cpp" />
+ <ClCompile Include="..\src\FindFile.cpp" />
+ <ClCompile Include="..\src\FrequencyTable.cpp" />
+ <ClCompile Include="..\src\GetOptionIndex.cpp" />
+ <ClCompile Include="..\src\Globals.cpp" />
+ <ClCompile Include="..\src\GuitarFrame.cpp" />
+ <ClCompile Include="..\src\GuitarSettings.cpp" />
+ <ClCompile Include="..\src\GuitarSettingsDialog.cpp" />
+ <ClCompile Include="..\src\GuitarWindow.cpp" />
+ <ClCompile Include="..\src\Harmony.cpp" />
+ <ClCompile Include="..\src\HarmonyBrowserAnalyzer.cpp" />
+ <ClCompile Include="..\src\HarmonyP.cpp" />
+ <ClCompile Include="..\src\Help.cpp" />
+ <ClCompile Include="..\src\JazzPlusPlusApplication.cpp" />
+ <ClCompile Include="..\src\KeyStringConverters.cpp" />
+ <ClCompile Include="..\src\Knob.cpp" />
+ <ClCompile Include="..\src\Mapper.cpp" />
+ <ClCompile Include="..\src\MeasureChoice.cpp" />
+ <ClCompile Include="..\src\Metronome.cpp" />
+ <ClCompile Include="..\src\MidiDeviceDialog.cpp" />
+ <ClCompile Include="..\src\MouseAction.cpp" />
+ <ClCompile Include="..\src\NamedChoice.cpp" />
+ <ClCompile Include="..\src\NamedValue.cpp" />
+ <ClCompile Include="..\src\NamedValueChoice.cpp" />
+ <ClCompile Include="..\src\PianoFrame.cpp" />
+ <ClCompile Include="..\src\PianoWindow.cpp" />
+ <ClCompile Include="..\src\Player.cpp" />
+ <ClCompile Include="..\src\PortMidiPlayer.cpp" />
+ <ClCompile Include="..\src\Project.cpp" />
+ <ClCompile Include="..\src\ProjectManager.cpp" />
+ <ClCompile Include="..\src\DeprecatedWx\prop.cpp" />
+ <ClCompile Include="..\src\PropertyListDialog.cpp" />
+ <ClCompile Include="..\src\DeprecatedWx\propform.cpp" />
+ <ClCompile Include="..\src\DeprecatedWx\proplist.cpp" />
+ <ClCompile Include="..\src\Random.cpp" />
+ <ClCompile Include="..\src\RecordingInfo.cpp" />
+ <ClCompile Include="..\src\Rectangle.cpp" />
+ <ClCompile Include="..\src\Rhythm.cpp" />
+ <ClCompile Include="..\src\Sample.cpp" />
+ <ClCompile Include="..\src\SampleCommand.cpp" />
+ <ClCompile Include="..\src\SampleDialog.cpp" />
+ <ClCompile Include="..\src\SampleFrame.cpp" />
+ <ClCompile Include="..\src\SampleWindow.cpp" />
+ <ClCompile Include="..\src\SelectControllerDialog.cpp" />
+ <ClCompile Include="..\src\Signal2.cpp" />
+ <ClCompile Include="..\src\SliderWindow.cpp" />
+ <ClCompile Include="..\src\Song.cpp" />
+ <ClCompile Include="..\src\StandardFile.cpp" />
+ <ClCompile Include="..\src\StringReadWrite.cpp" />
+ <ClCompile Include="..\src\StringUtilities.cpp" />
+ <ClCompile Include="..\src\Synth.cpp" />
+ <ClCompile Include="..\src\ToolBar.cpp" />
+ <ClCompile Include="..\src\Track.cpp" />
+ <ClCompile Include="..\src\TrackFrame.cpp" />
+ <ClCompile Include="..\src\TrackWindow.cpp" />
+ <ClCompile Include="..\src\mswin\WindowsAudioInterface.cpp" />
+ <ClCompile Include="..\src\mswin\WindowsConsole.cpp" />
+ <ClCompile Include="..\src\mswin\WindowsMidiInterface.cpp" />
+ <ClCompile Include="..\src\mswin\WindowsPlayer.cpp" />
+ <ClCompile Include="..\src\AboutDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\AudioSettingsDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\CleanupDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\ControllerDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\DeleteDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\EndOfTrackDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\FilterDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\IntegerEdit.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\KeyOnDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\LengthDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\MeterChangeDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\MidiChannelDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\MetronomeSettingsDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\PitchWheelDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\ProgramChangeDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\VelocityDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\TransposeDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\TrackDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\TextDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SysexDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SynthesizerSettingsDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SnapDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\ShiftDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SetTempoDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SearchAndReplaceDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\SamplesDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Dialogs\QuantizeDialog.cpp">
+ <Filter>Dialog Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\src\AsciiMidiFile.h" />
+ <ClInclude Include="..\src\Audio.h" />
+ <ClInclude Include="..\src\Command.h" />
+ <ClInclude Include="..\src\Configuration.h" />
+ <ClInclude Include="..\src\ControlEdit.h" />
+ <ClInclude Include="..\src\Dialogs.h" />
+ <ClInclude Include="..\src\DynamicArray.h" />
+ <ClInclude Include="..\src\ErrorMessage.h" />
+ <ClInclude Include="..\src\EventFrame.h" />
+ <ClInclude Include="..\src\Events.h" />
+ <ClInclude Include="..\src\EventWindow.h" />
+ <ClInclude Include="..\src\FileSelector.h" />
+ <ClInclude Include="..\src\Filter.h" />
+ <ClInclude Include="..\src\FindFile.h" />
+ <ClInclude Include="..\src\FrequencyTable.h" />
+ <ClInclude Include="..\src\GetOptionIndex.h" />
+ <ClInclude Include="..\src\Globals.h" />
+ <ClInclude Include="..\src\GuitarFrame.h" />
+ <ClInclude Include="..\src\GuitarSettings.h" />
+ <ClInclude Include="..\src\GuitarSettingsDialog.h" />
+ <ClInclude Include="..\src\GuitarWindow.h" />
+ <ClInclude Include="..\src\Harmony.h" />
+ <ClInclude Include="..\src\HarmonyBrowserAnalyzer.h" />
+ <ClInclude Include="..\src\HarmonyP.h" />
+ <ClInclude Include="..\src\Help.h" />
+ <ClInclude Include="..\src\JazzPlusPlusApplication.h" />
+ <ClInclude Include="..\src\KeyStringConverters.h" />
+ <ClInclude Include="..\src\Knob.h" />
+ <ClInclude Include="..\src\Mapper.h" />
+ <ClInclude Include="..\src\MeasureChoice.h" />
+ <ClInclude Include="..\src\Metronome.h" />
+ <ClInclude Include="..\src\MidiDeviceDialog.h" />
+ <ClInclude Include="..\src\MouseAction.h" />
+ <ClInclude Include="..\src\NamedChoice.h" />
+ <ClInclude Include="..\src\NamedValue.h" />
+ <ClInclude Include="..\src\NamedValueChoice.h" />
+ <ClInclude Include="..\src\PianoFrame.h" />
+ <ClInclude Include="..\src\PianoWindow.h" />
+ <ClInclude Include="..\src\Player.h" />
+ <ClInclude Include="..\src\PortMidiPlayer.h" />
+ <ClInclude Include="..\src\Project.h" />
+ <ClInclude Include="..\src\ProjectManager.h" />
+ <ClInclude Include="..\src\DeprecatedWx\prop.h" />
+ <ClInclude Include="..\src\PropertyListDialog.h" />
+ <ClInclude Include="..\src\DeprecatedWx\propform.h" />
+ <ClInclude Include="..\src\DeprecatedWx\proplist.h" />
+ <ClInclude Include="..\src\Random.h" />
+ <ClInclude Include="..\src\RecordingInfo.h" />
+ <ClInclude Include="..\src\Rectangle.h" />
+ <ClInclude Include="..\src\Resources.h" />
+ <ClInclude Include="..\src\Rhythm.h" />
+ <ClInclude Include="..\src\Sample.h" />
+ <ClInclude Include="..\src\SampleCommand.h" />
+ <ClInclude Include="..\src\SampleDialog.h" />
+ <ClInclude Include="..\src\SampleFrame.h" />
+ <ClInclude Include="..\src\SampleWindow.h" />
+ <ClInclude Include="..\src\SelectControllerDialog.h" />
+ <ClInclude Include="..\src\DeprecatedWx\setup.h" />
+ <ClInclude Include="..\src\Signal2.h" />
+ <ClInclude Include="..\src\SliderWindow.h" />
+ <ClInclude Include="..\src\Song.h" />
+ <ClInclude Include="..\src\StandardFile.h" />
+ <ClInclude Include="..\src\StringReadWrite.h" />
+ <ClInclude Include="..\src\StringUtilities.h" />
+ <ClInclude Include="..\src\Synth.h" />
+ <ClInclude Include="..\src\ToolBar.h" />
+ <ClInclude Include="..\src\Track.h" />
+ <ClInclude Include="..\src\TrackFrame.h" />
+ <ClInclude Include="..\src\TrackWindow.h" />
+ <ClInclude Include="..\src\mswin\WindowsAudioInterface.h" />
+ <ClInclude Include="..\src\mswin\WindowsConsole.h" />
+ <ClInclude Include="..\src\mswin\WindowsMidiInterface.h" />
+ <ClInclude Include="..\src\mswin\WindowsPlayer.h" />
+ <ClInclude Include="..\src\AboutDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\AudioSettingsDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\CleanupDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\ControllerDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\DeleteDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\EndOfTrackDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\FilterDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\IntegerEdit.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\KeyOnDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\LengthDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\MeterChangeDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\MidiChannelDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\MetronomeSettingsDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\PitchWheelDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\ProgramChangeDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\VelocityDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\TransposeDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\TrackDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\TextDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SysexDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SynthesizerSettingsDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SnapDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\ShiftDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SetTempoDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SearchAndReplaceDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\SamplesDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\Dialogs\QuantizeDialog.h">
+ <Filter>Dialog Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\src\Makefile.am" />
+ <None Include="..\src\HelpFiles\tex2rtf.ini">
+ <Filter>Help Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Help Files">
+ <UniqueIdentifier>{f0ad4f24-880f-4290-b84e-6c0af53b7b5f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Dialog Source Files">
+ <UniqueIdentifier>{7e14185d-521d-47ac-b425-dda76e9a5000}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\src\HelpFiles\jazz.tex">
+ <Filter>Help Files</Filter>
+ </CustomBuild>
+ </ItemGroup>
+</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 21:22:04
|
Revision: 916
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=916&view=rev
Author: pstieber
Date: 2012-11-29 21:21:57 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
1. Removed GUI from the build configuration names.
2. Updated to wxMSW 2.9.4.
Modified Paths:
--------------
trunk/jazz/vc10/JazzPlusPlus-VC10.sln
trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.sln
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.sln 2012-11-29 20:54:26 UTC (rev 915)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.sln 2012-11-29 21:21:57 UTC (rev 916)
@@ -8,36 +8,36 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug GUI VC10|Win32 = Debug GUI VC10|Win32
- Debug GUI VC10|x64 = Debug GUI VC10|x64
- Release GUI VC10|Win32 = Release GUI VC10|Win32
- Release GUI VC10|x64 = Release GUI VC10|x64
+ Debug VC10|Win32 = Debug VC10|Win32
+ Debug VC10|x64 = Debug VC10|x64
+ Release VC10|Win32 = Release VC10|Win32
+ Release VC10|x64 = Release VC10|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|Win32.ActiveCfg = Debug GUI VC10|Win32
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|Win32.Build.0 = Debug GUI VC10|Win32
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|x64.ActiveCfg = Debug GUI VC10|x64
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|x64.Build.0 = Debug GUI VC10|x64
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|Win32.ActiveCfg = Release GUI VC10|Win32
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|Win32.Build.0 = Release GUI VC10|Win32
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|x64.ActiveCfg = Release GUI VC10|x64
- {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|x64.Build.0 = Release GUI VC10|x64
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|Win32.ActiveCfg = Debug VC10|Win32
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|Win32.Build.0 = Debug VC10|Win32
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|x64.ActiveCfg = Debug VC10|x64
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|x64.Build.0 = Debug VC10|x64
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|Win32.ActiveCfg = Release VC10|Win32
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|Win32.Build.0 = Release VC10|Win32
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|x64.ActiveCfg = Release VC10|x64
- {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|x64.Build.0 = Release VC10|x64
- {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|Win32.ActiveCfg = Debug VC10|Win32
- {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|Win32.Build.0 = Debug VC10|Win32
- {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|x64.ActiveCfg = Debug VC10|x64
- {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|x64.Build.0 = Debug VC10|x64
- {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|Win32.ActiveCfg = Release VC10|Win32
- {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|Win32.Build.0 = Release VC10|Win32
- {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|x64.ActiveCfg = Release VC10|x64
- {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|x64.Build.0 = Release VC10|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC10|Win32.ActiveCfg = Debug VC10|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC10|Win32.Build.0 = Debug VC10|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC10|x64.ActiveCfg = Debug VC10|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC10|x64.Build.0 = Debug VC10|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC10|Win32.ActiveCfg = Release VC10|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC10|Win32.Build.0 = Release VC10|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC10|x64.ActiveCfg = Release VC10|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC10|x64.Build.0 = Release VC10|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC10|Win32.ActiveCfg = Debug VC10|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC10|Win32.Build.0 = Debug VC10|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC10|x64.ActiveCfg = Debug VC10|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC10|x64.Build.0 = Debug VC10|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC10|Win32.ActiveCfg = Release VC10|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC10|Win32.Build.0 = Release VC10|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC10|x64.ActiveCfg = Release VC10|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC10|x64.Build.0 = Release VC10|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC10|Win32.ActiveCfg = Debug VC10|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC10|Win32.Build.0 = Debug VC10|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC10|x64.ActiveCfg = Debug VC10|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC10|x64.Build.0 = Debug VC10|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC10|Win32.ActiveCfg = Release VC10|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC10|Win32.Build.0 = Release VC10|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC10|x64.ActiveCfg = Release VC10|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC10|x64.Build.0 = Release VC10|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2012-11-29 20:54:26 UTC (rev 915)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2012-11-29 21:21:57 UTC (rev 916)
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug GUI VC10|Win32">
- <Configuration>Debug GUI VC10</Configuration>
+ <ProjectConfiguration Include="Debug VC10|Win32">
+ <Configuration>Debug VC10</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug GUI VC10|x64">
- <Configuration>Debug GUI VC10</Configuration>
+ <ProjectConfiguration Include="Debug VC10|x64">
+ <Configuration>Debug VC10</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release GUI VC10|Win32">
- <Configuration>Release GUI VC10</Configuration>
+ <ProjectConfiguration Include="Release VC10|Win32">
+ <Configuration>Release VC10</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release GUI VC10|x64">
- <Configuration>Release GUI VC10</Configuration>
+ <ProjectConfiguration Include="Release VC10|x64">
+ <Configuration>Release VC10</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
@@ -24,22 +24,22 @@
<RootNamespace>A JazzPlusPlus Application</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
@@ -47,39 +47,39 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">JazzPlusPlus</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">JazzPlusPlus</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">JazzPlusPlus</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">JazzPlusPlus</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">JazzPlusPlus</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -91,7 +91,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -112,13 +112,13 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxmsw29ud_xrc.lib;wxbase29ud_xml.lib;wxexpatd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;wxmsw29ud_html.lib;wxbase29ud.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -129,7 +129,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -141,7 +141,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -162,13 +162,13 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxmsw29ud_xrc.lib;wxbase29ud_xml.lib;wxexpatd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;wxmsw29ud_html.lib;wxbase29ud.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -179,7 +179,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -192,7 +192,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -214,13 +214,13 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxmsw29u_xrc.lib;wxbase29u_xml.lib;wxexpat.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxmsw29u_html.lib;wxbase29u.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -230,7 +230,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -243,7 +243,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -266,13 +266,13 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxmsw29u_xrc.lib;wxbase29u_xml.lib;wxexpat.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxmsw29u_html.lib;wxbase29u.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -287,10 +287,10 @@
<ClCompile Include="..\src\AsciiMidiFile.cpp" />
<ClCompile Include="..\src\Audio.cpp" />
<ClCompile Include="..\src\ClockDialog.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\Command.cpp" />
<ClCompile Include="..\src\Configuration.cpp" />
@@ -393,10 +393,10 @@
<ClInclude Include="..\src\AsciiMidiFile.h" />
<ClInclude Include="..\src\Audio.h" />
<CustomBuildStep Include="..\src\ClockDialog.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">true</ExcludedFromBuild>
</CustomBuildStep>
<ClInclude Include="..\src\Command.h" />
<ClInclude Include="..\src\Configuration.h" />
@@ -499,33 +499,34 @@
<ItemGroup>
<CustomBuild Include="..\src\HelpFiles\jazz.tex">
<FileType>Document</FileType>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">Performing Custom Help Build Step</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">echo cd "%(RootDir)%(Directory)"
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">Performing Custom Help Build Step</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">echo cd "%(RootDir)%(Directory)"
cd "%(RootDir)%(Directory)"
-echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
-$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+echo $(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">Performing Custom Help Build Step</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">echo cd "%(RootDir)%(Directory)"
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">Performing Custom Help Build Step</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">echo cd "%(RootDir)%(Directory)"
cd "%(RootDir)%(Directory)"
-echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
-$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+echo $(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">echo cd "%(RootDir)%(Directory)"
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">echo cd "%(RootDir)%(Directory)"
cd "%(RootDir)%(Directory)"
-echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
-$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+echo $(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">echo cd "%(RootDir)%(Directory)"
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">echo cd "%(RootDir)%(Directory)"
cd "%(RootDir)%(Directory)"
-echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
-$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+echo $(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.4-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
</CustomBuild>
+ <None Include="..\src\HelpFiles\tex2rtf.ini" />
<None Include="..\src\Makefile.am" />
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 20:54:32
|
Revision: 915
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=915&view=rev
Author: pstieber
Date: 2012-11-29 20:54:26 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Fixed the signature of the winmm_time_callback function to remove
VS warnings.
Modified Paths:
--------------
trunk/jazz/portmidi/porttime/ptwinmm.c
Modified: trunk/jazz/portmidi/porttime/ptwinmm.c
===================================================================
--- trunk/jazz/portmidi/porttime/ptwinmm.c 2012-11-29 20:53:03 UTC (rev 914)
+++ trunk/jazz/portmidi/porttime/ptwinmm.c 2012-11-29 20:54:26 UTC (rev 915)
@@ -17,9 +17,9 @@
void CALLBACK winmm_time_callback(
UINT uID,
UINT uMsg,
- DWORD dwUser,
- DWORD dw1,
- DWORD dw2)
+ DWORD_PTR dwUser,
+ DWORD_PTR dw1,
+ DWORD_PTR dw2)
{
(*time_callback)(Pt_Time(), (void *) dwUser);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 20:53:10
|
Revision: 914
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=914&view=rev
Author: pstieber
Date: 2012-11-29 20:53:03 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
1. Disabled VS warning 4996.
2. VS automatically made the other changes.
Modified Paths:
--------------
trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj
Modified: trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj
===================================================================
--- trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj 2012-11-29 18:28:27 UTC (rev 913)
+++ trunk/jazz/portmidi/pm_win/portmidi-VC9.vcproj 2012-11-29 20:53:03 UTC (rev 914)
@@ -57,6 +57,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -93,7 +94,7 @@
/>
</Configuration>
<Configuration
- Name="Release VC9|Win32"
+ Name="Debug VC9|x64"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -115,29 +116,31 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\pm_common;..\porttime;..\pm_win"
- PreprocessorDefinitions="WIN32;_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ 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"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -167,7 +170,7 @@
/>
</Configuration>
<Configuration
- Name="Debug VC9|x64"
+ Name="Release VC9|Win32"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -189,30 +192,30 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\pm_common;..\porttime;..\pm_win"
- PreprocessorDefinitions="_LIB;DEBUG;PM_CHECK_ERRORS;_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\$(OutDir)\portmidi.pch"
AssemblerListingLocation=".\$(OutDir)\"
ObjectFile=".\$(OutDir)\"
ProgramDataBaseFileName=".\$(OutDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -281,6 +284,7 @@
ProgramDataBaseFileName=".\$(OutDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 18:28:33
|
Revision: 913
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=913&view=rev
Author: pstieber
Date: 2012-11-29 18:28:27 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Removed GUI from the build configuration names.
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 2012-11-29 15:50:31 UTC (rev 912)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2012-11-29 18:28:27 UTC (rev 913)
@@ -12,36 +12,36 @@
EndProject
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
+ Debug VC9|Win32 = Debug VC9|Win32
+ Debug VC9|x64 = Debug VC9|x64
+ Release VC9|Win32 = Release VC9|Win32
+ Release VC9|x64 = Release 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 = 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
- {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
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC9|Win32.ActiveCfg = Debug VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC9|Win32.Build.0 = Debug VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC9|x64.ActiveCfg = Debug VC9|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC9|x64.Build.0 = Debug VC9|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC9|Win32.ActiveCfg = Release VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC9|Win32.Build.0 = Release VC9|Win32
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC9|x64.ActiveCfg = Release VC9|x64
+ {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC9|x64.Build.0 = Release VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC9|Win32.ActiveCfg = Debug VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC9|Win32.Build.0 = Debug VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC9|x64.ActiveCfg = Debug VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC9|x64.Build.0 = Debug VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC9|Win32.ActiveCfg = Release VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC9|Win32.Build.0 = Release VC9|Win32
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC9|x64.ActiveCfg = Release VC9|x64
+ {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC9|x64.Build.0 = Release VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC9|Win32.ActiveCfg = Debug VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC9|Win32.Build.0 = Debug VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC9|x64.ActiveCfg = Debug VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC9|x64.Build.0 = Debug VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC9|Win32.ActiveCfg = Release VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC9|Win32.Build.0 = Release VC9|Win32
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release VC9|x64.ActiveCfg = Release VC9|x64
+ {338224B8-D575-408D-BACF-95C557B429BE}.Release 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 2012-11-29 15:50:31 UTC (rev 912)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2012-11-29 18:28:27 UTC (rev 913)
@@ -19,7 +19,7 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug GUI VC9|Win32"
+ Name="Debug VC9|Win32"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -118,7 +118,7 @@
/>
</Configuration>
<Configuration
- Name="Debug GUI VC9|x64"
+ Name="Debug VC9|x64"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -217,7 +217,7 @@
/>
</Configuration>
<Configuration
- Name="Release GUI VC9|Win32"
+ Name="Release VC9|Win32"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -317,7 +317,7 @@
/>
</Configuration>
<Configuration
- Name="Release GUI VC9|x64"
+ Name="Release VC9|x64"
OutputDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="BuildDir\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -701,7 +701,7 @@
RelativePath="..\src\NamedChoice.cpp"
>
<FileConfiguration
- Name="Debug GUI VC9|Win32"
+ Name="Debug VC9|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -713,7 +713,7 @@
RelativePath="..\src\NamedChoice.h"
>
<FileConfiguration
- Name="Debug GUI VC9|Win32"
+ Name="Debug VC9|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1034,7 +1034,7 @@
RelativePath="..\src\HelpFiles\jazz.tex"
>
<FileConfiguration
- Name="Debug GUI VC9|Win32"
+ Name="Debug VC9|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -1044,7 +1044,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug GUI VC9|x64"
+ Name="Debug VC9|x64"
>
<Tool
Name="VCCustomBuildTool"
@@ -1054,7 +1054,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release GUI VC9|Win32"
+ Name="Release VC9|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -1063,7 +1063,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release GUI VC9|x64"
+ Name="Release VC9|x64"
>
<Tool
Name="VCCustomBuildTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-11-29 15:50:41
|
Revision: 912
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=912&view=rev
Author: pstieber
Date: 2012-11-29 15:50:31 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Added a directory for Visual Studio 2012 project and solution files.
Added Paths:
-----------
trunk/jazz/vc12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2012-05-12 15:51:42
|
Revision: 911
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=911&view=rev
Author: pstieber
Date: 2012-05-12 15:51:35 +0000 (Sat, 12 May 2012)
Log Message:
-----------
Updated the use the current trunk of wxWidgets (2.9.4).
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-08 04:49:35 UTC (rev 910)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2012-05-12 15:51:35 UTC (rev 911)
@@ -51,7 +51,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.4-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -75,7 +75,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.9.4-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -86,7 +86,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -150,7 +150,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_amd64_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.4-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -174,7 +174,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.9.4-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -185,7 +185,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_amd64_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -250,7 +250,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.4-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -275,7 +275,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.9.4-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -286,7 +286,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -350,7 +350,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_amd64_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.4-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -376,7 +376,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.11-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.9.4-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -387,7 +387,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.4-VC9\lib\vc_amd64_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -1039,7 +1039,7 @@
<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
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.9.4-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>
@@ -1049,7 +1049,7 @@
<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
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.9.4-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>
@@ -1058,7 +1058,7 @@
>
<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
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
@@ -1067,7 +1067,7 @@
>
<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
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.9.4-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 04:49:41
|
Revision: 910
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=910&view=rev
Author: pstieber
Date: 2011-08-08 04:49:35 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Dropped Visual Studio .NET 2005 support.
Removed Paths:
-------------
trunk/jazz/vc8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 04:47:33
|
Revision: 909
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=909&view=rev
Author: pstieber
Date: 2011-08-08 04:47:27 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Updated a wxToolBar::AddTool call.
Modified Paths:
--------------
trunk/jazz/src/ToolBar.cpp
Modified: trunk/jazz/src/ToolBar.cpp
===================================================================
--- trunk/jazz/src/ToolBar.cpp 2011-08-08 04:28:33 UTC (rev 908)
+++ trunk/jazz/src/ToolBar.cpp 2011-08-08 04:47:27 UTC (rev 909)
@@ -69,14 +69,18 @@
{
mpToolBar->AddCheckTool(
pToolDef->mId,
- "",
+ wxEmptyString,
Bitmap,
wxNullBitmap,
pToolDef->mpToolTip);
}
else
{
- mpToolBar->AddTool(pToolDef->mId, Bitmap, pToolDef->mpToolTip);
+ mpToolBar->AddTool(
+ pToolDef->mId,
+ wxEmptyString,
+ Bitmap,
+ pToolDef->mpToolTip);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 04:28:39
|
Revision: 908
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=908&view=rev
Author: pstieber
Date: 2011-08-08 04:28:33 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Changed long to int in several places on the Linux side.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.cpp
trunk/jazz/src/AlsaDriver.h
trunk/jazz/src/AlsaPlayer.cpp
trunk/jazz/src/AlsaPlayer.h
trunk/jazz/src/AudioDriver.cpp
trunk/jazz/src/AudioDriver.h
trunk/jazz/src/Player.h
Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AlsaDriver.cpp 2011-08-08 04:28:33 UTC (rev 908)
@@ -69,8 +69,8 @@
JZAlsaAudioListener(
JZAlsaAudioPlayer* pPlayer,
JZSample& spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
: wxTimer(),
mpPlayer(pPlayer),
mHardExit(true)
@@ -107,7 +107,7 @@
}
}
- long GetPlayPosition()
+ int GetPlayPosition()
{
return mpPlayer->GetCurrentPosition(JZAlsaAudioPlayer::PLAYBACK);
}
@@ -175,7 +175,7 @@
return running_mode & (1 << PLAYBACK);
}
-void JZAlsaAudioPlayer::StartPlay(long clock, long loopClock, int cont)
+void JZAlsaAudioPlayer::StartPlay(int clock, int loopClock, int cont)
{
delete mpListener;
mSamples.StartPlay(clock);
@@ -186,7 +186,7 @@
return;
}
- long ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
+ int ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
mSamples.ResetBuffers(mpAudioBuffer, clock, ticks_per_minute);
last_scount = 0;
cur_pos = 0;
@@ -517,20 +517,20 @@
}
-void JZAlsaAudioPlayer::ResetPlay(long clock)
+void JZAlsaAudioPlayer::ResetPlay(int clock)
{
JZAlsaPlayer::ResetPlay(clock);
if (pcm[PLAYBACK])
{
snd_pcm_drop(pcm[PLAYBACK]);
-// long ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
+// int ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
// mSamples.ResetBuffers(mpAudioBuffer, clock, ticks_per_minute);
}
audio_clock_offset = clock;
cur_pos = 0;
}
-long JZAlsaAudioPlayer::GetCurrentPosition(int mode)
+int JZAlsaAudioPlayer::GetCurrentPosition(int mode)
{
return cur_scount;
}
@@ -556,7 +556,7 @@
return; // disabled
}
- long scount = GetCurrentPosition(mode);
+ int scount = GetCurrentPosition(mode);
// get realtime info for audio/midi sync
if (scount != last_scount)
@@ -581,8 +581,8 @@
}
last_scount = scount;
cur_pos += samplediff;
- long audio_clock =
- (long)mSamples.Samples2Ticks(cur_pos) + audio_clock_offset;
+ int audio_clock =
+ (int)mSamples.Samples2Ticks(cur_pos) + audio_clock_offset;
int delta_clock = audio_clock - qtick;
int new_speed = midi_speed + delta_clock;
@@ -625,12 +625,12 @@
CloseDsp(true);
if (RecordMode())
{
- long frc = mpRecordingInfo->mFromClock;
+ int frc = mpRecordingInfo->mFromClock;
if (frc < audio_clock_offset)
{
frc = audio_clock_offset;
}
- long toc = mpRecordingInfo->mToClock;
+ int toc = mpRecordingInfo->mToClock;
if (toc > recd_clock)
{
toc = recd_clock;
@@ -670,7 +670,7 @@
mpListener = new JZAlsaAudioListener(this, key);
}
-void JZAlsaAudioPlayer::ListenAudio(JZSample& spl, long fr_smpl, long to_smpl)
+void JZAlsaAudioPlayer::ListenAudio(JZSample& spl, int fr_smpl, int to_smpl)
{
if (!mAudioEnabled)
{
@@ -691,7 +691,7 @@
mpListener = new JZAlsaAudioListener(this, spl, fr_smpl, to_smpl);
}
-long JZAlsaAudioPlayer::GetListenerPlayPosition()
+int JZAlsaAudioPlayer::GetListenerPlayPosition()
{
if (!mpListener)
{
Modified: trunk/jazz/src/AlsaDriver.h
===================================================================
--- trunk/jazz/src/AlsaDriver.h 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AlsaDriver.h 2011-08-08 04:28:33 UTC (rev 908)
@@ -41,7 +41,7 @@
virtual ~JZAlsaAudioPlayer();
int LoadSamples(const char *filename);
virtual void Notify();
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
virtual bool IsInstalled()
{
@@ -56,14 +56,14 @@
mAudioEnabled = AudioEnabled;
}
virtual void ListenAudio(int key, int start_stop_mode = 1);
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl);
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl);
virtual bool IsListening() const
{
return mpListener != 0;
}
- virtual long GetListenerPlayPosition();
+ virtual int GetListenerPlayPosition();
virtual void StartAudio();
- virtual void ResetPlay(long clock);
+ virtual void ResetPlay(int clock);
enum
{
@@ -84,7 +84,7 @@
void CloseDsp(bool Reset);
- long GetCurrentPosition(int mode);
+ int GetCurrentPosition(int mode);
int GetFreeSpace(int mode);
// If true can do full duplex record/play.
@@ -93,10 +93,10 @@
snd_pcm_t *pcm[2];
bool mInstalled;
- long audio_clock_offset;
- long cur_pos;
- long last_scount;
- long cur_scount;
+ int audio_clock_offset;
+ int cur_pos;
+ int last_scount;
+ int cur_scount;
int running_mode;
int midi_speed; // start speed in bpm
int curr_speed; // actual speed in bpm
@@ -106,10 +106,10 @@
int card; // card number in config
std::string mDeviceNames[2]; // device names
- long frag_size[2];
- long frag_byte_size[2];
+ int frag_size[2];
+ int frag_byte_size[2];
int frame_shift[2];
- long frame_boundary[2];
+ int frame_boundary[2];
JZAlsaAudioListener* mpListener;
JZAudioRecordBuffer recbuffers;
Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AlsaPlayer.cpp 2011-08-08 04:28:33 UTC (rev 908)
@@ -543,7 +543,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAlsaPlayer::OutBreak(long clock)
+void JZAlsaPlayer::OutBreak(int clock)
{
while (echo_clock + 48 < clock)
{
@@ -559,7 +559,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAlsaPlayer::StartPlay(long clock, long loopClock, int cont)
+void JZAlsaPlayer::StartPlay(int clock, int loopClock, int cont)
{
recd_clock = clock;
echo_clock = clock;
@@ -573,7 +573,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAlsaPlayer::ResetPlay(long clock)
+void JZAlsaPlayer::ResetPlay(int clock)
{
// Purge queues.
snd_seq_drop_output_buffer(handle);
@@ -594,7 +594,7 @@
void JZAlsaPlayer::Notify()
{
// called by timer
- long Now = GetRealTimeClock();
+ int Now = GetRealTimeClock();
cout << "JZAlsaPlayer::Notify " << Now << ' ' << play_clock << endl;
@@ -657,7 +657,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAlsaPlayer::set_event_header(snd_seq_event_t *ev, long clock, int type)
+void JZAlsaPlayer::set_event_header(snd_seq_event_t *ev, int clock, int type)
{
memset(ev, 0, sizeof(*ev));
snd_seq_ev_set_source(ev, self.port);
@@ -671,7 +671,7 @@
//-----------------------------------------------------------------------------
void JZAlsaPlayer::set_event_header(
snd_seq_event_t *ev,
- long clock,
+ int clock,
int len,
void *ptr)
{
@@ -686,7 +686,7 @@
// Description:
// Initialize the alsa timer.
//-----------------------------------------------------------------------------
-int JZAlsaPlayer::start_timer(long clock)
+int JZAlsaPlayer::start_timer(int clock)
{
int time_base = mpSong->GetTicksPerQuarter();
int cur_speed = mpSong->GetTrack(0)->GetCurrentSpeed(clock);
@@ -716,7 +716,7 @@
// Immediately start the alsa queue timer. Do this by sending an "start"
// event to the queue.
//-----------------------------------------------------------------------------
-void JZAlsaPlayer::start_queue_timer(long clock)
+void JZAlsaPlayer::start_queue_timer(int clock)
{
stop_queue_timer(); // to be sure
@@ -938,11 +938,11 @@
// looking at time stamps on events in the queue, and also updates the
// display, so the name is not well chosen.
//-----------------------------------------------------------------------------
-long JZAlsaPlayer::GetRealTimeClock()
+int JZAlsaPlayer::GetRealTimeClock()
{
// input recorded events (including my echo events)
snd_seq_event_t *ie;
- long old_recd_clock = recd_clock;
+ int old_recd_clock = recd_clock;
while (snd_seq_event_input(handle, &ie) >= 0 && ie != 0)
{
recd_event(ie);
Modified: trunk/jazz/src/AlsaPlayer.h
===================================================================
--- trunk/jazz/src/AlsaPlayer.h 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AlsaPlayer.h 2011-08-08 04:28:33 UTC (rev 908)
@@ -62,10 +62,10 @@
}
void OutNow(JZParam *r);
void OutBreak();
- void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
virtual void SetSoftThru(int on, int idev, int odev);
virtual int SupportsMultipleDevices()
{
@@ -114,17 +114,17 @@
JZAlsaDeviceList& Devicelist,
unsigned DeviceCapabilities);
int select_list(JZAlsaDeviceList &list, const char *title, int def_device);
- int start_timer(long clock);
+ int start_timer(int clock);
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);
+ void set_event_header(snd_seq_event_t *ev, int clock, int type);
+ void set_event_header(snd_seq_event_t *ev, int clock, int len, void *ptr);
void init_queue_tempo(int time_base, int bpm);
- void start_queue_timer(long clock);
+ void start_queue_timer(int clock);
void stop_queue_timer();
void recd_event(snd_seq_event_t *ev);
void flush_output();
@@ -134,15 +134,15 @@
void set_pool_sizes();
int compose_echo(int clock, unsigned int arg = 0);
virtual void StartAudio();
- virtual void ResetPlay(long clock);
+ virtual void ResetPlay(int clock);
int sync_master();
void sync_master_remove();
int sync_slave();
void sync_slave_remove();
- long play_clock; // current clock
- long recd_clock; // clock received so far from recorded events or echo events
- long echo_clock; // echo events have been sent up to this clock
+ int play_clock; // current clock
+ int recd_clock; // clock received so far from recorded events or echo events
+ int echo_clock; // echo events have been sent up to this clock
JZAlsaThru *thru;
int ithru, othru; // index in iaddr, oaddr of source/target device
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AudioDriver.cpp 2011-08-08 04:28:33 UTC (rev 908)
@@ -64,8 +64,8 @@
JZAudioListener(
JZAudioPlayer* pPlayer,
JZSample& spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
: wxTimer(),
mpPlayer(pPlayer),
mCount(0),
@@ -97,7 +97,7 @@
}
}
- long GetPlayPosition()
+ int GetPlayPosition()
{
count_info cinfo;
if (ioctl(mpPlayer->dev, SNDCTL_DSP_GETOPTR, &cinfo) == -1)
@@ -200,7 +200,7 @@
return;
}
- long ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
+ int ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
mSamples.ResetBuffers(mpAudioBuffer, start_clock, ticks_per_minute);
if (PlaybackMode())
{
@@ -480,7 +480,7 @@
// search for SNDCTL_DSP_GETOPTR in linux/drivers/sound/dmabuf
// before trying to understand the next line
- long new_bytes = cinfo.bytes - cinfo.ptr; // info.ptr is garbage!!
+ int new_bytes = cinfo.bytes - cinfo.ptr; // info.ptr is garbage!!
if (new_bytes != audio_bytes)
{
// driver has processed some bytes or whole fragment
@@ -493,7 +493,7 @@
audio_bytes = new_bytes;
// OSS bug?: mpu401 does not like speed changes too often
- long audio_clock = (long)mSamples.Samples2Ticks(audio_bytes / 2);
+ int audio_clock = (int)mSamples.Samples2Ticks(audio_bytes / 2);
int delta_clock = audio_clock - midi_clock;
int new_speed = midi_speed + delta_clock;
@@ -525,7 +525,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAudioPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZAudioPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
delete mpListener;
mSamples.StartPlay(Clock);
@@ -546,12 +546,12 @@
CloseDsp(true);
if (RecordMode())
{
- long frc = mpRecordingInfo->mFromClock;
+ int frc = mpRecordingInfo->mFromClock;
if (frc < start_clock)
{
frc = start_clock;
}
- long toc = mpRecordingInfo->mToClock;
+ int toc = mpRecordingInfo->mToClock;
if (toc > recd_clock)
{
toc = recd_clock;
@@ -595,7 +595,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZAudioPlayer::ListenAudio(JZSample &spl, long fr_smpl, long to_smpl)
+void JZAudioPlayer::ListenAudio(JZSample &spl, int fr_smpl, int to_smpl)
{
if (!mAudioEnabled)
{
@@ -617,7 +617,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZAudioPlayer::GetListenerPlayPosition()
+int JZAudioPlayer::GetListenerPlayPosition()
{
if (!mpListener)
{
Modified: trunk/jazz/src/AudioDriver.h
===================================================================
--- trunk/jazz/src/AudioDriver.h 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/AudioDriver.h 2011-08-08 04:28:33 UTC (rev 908)
@@ -54,7 +54,7 @@
virtual void Notify();
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
@@ -77,14 +77,14 @@
virtual void ListenAudio(int key, int start_stop_mode = 1);
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl);
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl);
virtual bool IsListening() const
{
return mpListener != 0;
}
- virtual long GetListenerPlayPosition();
+ virtual int GetListenerPlayPosition();
// for recording
int RecordMode() const;
@@ -109,8 +109,8 @@
int dev;
bool mInstalled;
- long midi_clock;
- long audio_bytes;
+ int midi_clock;
+ int audio_bytes;
int midi_speed; // start speed in bpm
int curr_speed; // actual speed in bpm
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2011-08-08 04:11:58 UTC (rev 907)
+++ trunk/jazz/src/Player.h 2011-08-08 04:28:33 UTC (rev 908)
@@ -293,7 +293,7 @@
virtual int GetListenerPlayPosition()
{
- return -1L;
+ return -1;
}
void LoadDefaultSettings()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 04:12:05
|
Revision: 907
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=907&view=rev
Author: pstieber
Date: 2011-08-08 04:11:58 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Changed int to long because they are the same size even on a 64-bit Windows platform.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/PortMidiPlayer.cpp
trunk/jazz/src/PortMidiPlayer.h
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/src/mswin/WindowsAudioInterface.h
trunk/jazz/src/mswin/WindowsConsole.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
trunk/jazz/src/mswin/WindowsPlayer.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Audio.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -622,7 +622,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSampleSet::StartPlay(long clock)
+void JZSampleSet::StartPlay(int clock)
{
ReloadSamples();
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Audio.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -344,7 +344,7 @@
virtual const std::string& GetSampleLabel(int Index);
- void StartPlay(long clock);
+ void StartPlay(int clock);
void StopPlay();
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Player.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -107,7 +107,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPlayLoop::Set(long Start, long Stop)
+void JZPlayLoop::Set(int Start, int Stop)
{
mStartClock = Start;
mStopClock = Stop;
@@ -115,7 +115,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPlayLoop::Ext2IntClock(long Clock)
+int JZPlayLoop::Ext2IntClock(int Clock)
{
if (mStopClock)
{
@@ -126,7 +126,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPlayLoop::Int2ExtClock(long Clock)
+int JZPlayLoop::Int2ExtClock(int Clock)
{
return Clock;
}
@@ -138,8 +138,8 @@
void JZPlayLoop::PrepareOutput(
JZEventArray* pEventArray,
JZSong* pSong,
- long ExtFr,
- long ExtTo,
+ int ExtFr,
+ int ExtTo,
bool AudioMode)
{
if (pEventArray == 0)
@@ -147,9 +147,9 @@
return;
}
- long From = Ext2IntClock(ExtFr);
- long Delta = ExtFr - From;
- long Size = ExtTo - ExtFr;
+ int From = Ext2IntClock(ExtFr);
+ int Delta = ExtFr - From;
+ int Size = ExtTo - ExtFr;
while (mStopClock && From + Size > mStopClock)
{
pSong->MergeTracks(
@@ -209,7 +209,7 @@
void JZPlayer::Notify()
{
// called by timer
- long Now = GetRealTimeClock();
+ int Now = GetRealTimeClock();
#ifdef DEBUG_PLAYER_NOTIFY
cout << "JZPlayer::Notify " << Now << endl;
@@ -301,7 +301,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
#ifdef DEBUG_PLAYER_STARTPLAY
cout << "JZPlayer::StartPlay" << endl;
@@ -608,7 +608,7 @@
Stop();
mPlaying = false;
- long Clock = GetRealTimeClock();
+ int Clock = GetRealTimeClock();
// SN++ Patch: Notes off for not GM/GS devices
int ii;
@@ -798,9 +798,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZMpuPlayer::StartPlay(long IntClock, long LoopClock, int Continue)
+void JZMpuPlayer::StartPlay(int IntClock, int LoopClock, int Continue)
{
- long ExtClock = mpPlayLoop->Int2ExtClock(IntClock);
+ int ExtClock = mpPlayLoop->Int2ExtClock(IntClock);
char *play;
int playsize;
@@ -1025,7 +1025,7 @@
ActiveTrack = 6;
}
- long Time = pEvent->GetClock() - TrackClock[ActiveTrack];
+ int Time = pEvent->GetClock() - TrackClock[ActiveTrack];
assert(Time < 240);
if (Stat != TrackRunningStatus[ActiveTrack])
@@ -1081,7 +1081,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZMpuPlayer::OutBreak(long BreakOver)
+void JZMpuPlayer::OutBreak(int BreakOver)
{
int OverFlow = 1;
@@ -1183,7 +1183,7 @@
//-----------------------------------------------------------------------------
// try to send all out of band events up to Clock to device
//-----------------------------------------------------------------------------
-void JZMpuPlayer::FlushOutOfBand(long Clock)
+void JZMpuPlayer::FlushOutOfBand(int Clock)
{
JZEventIterator Iterator(&OutOfBandEvents);
JZEvent* pEvent = Iterator.Range(0, Clock);
@@ -1229,10 +1229,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZMpuPlayer::GetRealTimeClock()
+int JZMpuPlayer::GetRealTimeClock()
{
static int receiving_song_ptr = 0;
- static long d0, d1;
+ static int d0, d1;
int c;
while ((c = RecBytes.Get(dev)) >= 0)
{
@@ -1278,7 +1278,7 @@
// Song pointer received
receiving_song_ptr++;
- long ExtClock;
+ int ExtClock;
switch (receiving_song_ptr)
{
@@ -1306,7 +1306,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZMpuPlayer::GetRecordedData()
+int JZMpuPlayer::GetRecordedData()
{
int c, i;
unsigned char *recbuf = NULL;
@@ -1862,7 +1862,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSeq2Player::OutBreak(long clock)
+void JZSeq2Player::OutBreak(int clock)
{
if (play_clock < clock)
{
@@ -1892,7 +1892,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSeq2Player::StartPlay(long Clock, long LoopClock, int Continue)
+void JZSeq2Player::StartPlay(int Clock, int LoopClock, int Continue)
{
char buf[512];
cout<<"JZSeq2Player::StartPlay"<<endl;
@@ -2018,7 +2018,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZSeq2Player::GetRealTimeClock()
+int JZSeq2Player::GetRealTimeClock()
{
unsigned char buf[256];
int size;
@@ -2036,7 +2036,7 @@
{
case TMR_WAIT_ABS:
case TMR_ECHO:
- recd_clock = *(unsigned long *)&buf[i+4] + start_clock;
+ recd_clock = *(unsigned int *)&buf[i+4] + start_clock;
break;
default:
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/Player.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -102,30 +102,30 @@
JZPlayLoop();
- void Set(long Start, long Stop);
+ void Set(int Start, int Stop);
void Reset();
// external clock -> internal clock where
// external clock == physical clock
// internal clock == song position
- long Ext2IntClock(long Clock);
+ int Ext2IntClock(int Clock);
// the other way round
- long Int2ExtClock(long Clock);
+ int Int2ExtClock(int Clock);
void PrepareOutput(
JZEventArray* pEventArray,
JZSong* pSong,
- long ExtFr,
- long ExtTo,
+ int ExtFr,
+ int ExtTo,
bool AudioMode = false);
private:
- long mStartClock;
+ int mStartClock;
- long mStopClock;
+ int mStopClock;
};
//*****************************************************************************
@@ -163,9 +163,9 @@
void OutNow(JZTrack* t, JZParam* r);
// what's played right now?
- virtual long GetRealTimeClock() = 0;
+ virtual int GetRealTimeClock() = 0;
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
virtual void AllNotesOff(bool Reset = false);
@@ -255,7 +255,7 @@
virtual void ListenAudio(int key, int start_stop_mode = 1)
{
}
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl)
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl)
{
}
virtual bool IsListening() const
@@ -270,7 +270,7 @@
virtual void AdjustAudioLength(JZTrack *t)
{
- long ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
+ int ticks_per_minute = mpSong->GetTicksPerQuarter() * mpSong->Speed();
mSamples.AdjustAudioLength(t, ticks_per_minute);
}
@@ -291,7 +291,7 @@
mSamples.Edit(key);
}
- virtual long GetListenerPlayPosition()
+ virtual int GetListenerPlayPosition()
{
return -1L;
}
@@ -307,7 +307,7 @@
protected:
- long mOutClock;
+ int mOutClock;
JZPlayLoop* mpPlayLoop;
@@ -354,7 +354,7 @@
public:
- long Clock;
+ int Clock;
int RunningStatus;
void Clear()
@@ -398,9 +398,9 @@
return (int)sizeof(Buffer) - Written;
}
- void PutVar(long val)
+ void PutVar(int val)
{
- unsigned long buf;
+ unsigned int buf;
buf = val & 0x7f;
while ((val >>= 7) > 0)
{
@@ -419,9 +419,9 @@
}
}
- long GetVar(int dev)
+ int GetVar(int dev)
{
- unsigned long val;
+ unsigned int val;
int c;
val = Get(dev);
if (val & 0x80)
@@ -504,11 +504,11 @@
int dev;
JZBuffer PlyBytes;
JZBuffer RecBytes;
- long playclock;
+ int playclock;
int clock_to_host_counter;
int ActiveTrack;
- long TrackClock[ACTIVE_TRACKS];
+ int TrackClock[ACTIVE_TRACKS];
int TrackRunningStatus[ACTIVE_TRACKS];
JZEventArray OutOfBandEvents;
@@ -520,15 +520,15 @@
int OutEvent(JZEvent *e);
void OutNow(JZEvent *e);
void OutBreak();
- void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
virtual bool IsInstalled();
- long GetRecordedData();
+ int GetRecordedData();
void SetHardThru(int on, int idev, int odev);
- void FlushOutOfBand( long Clock );
+ void FlushOutOfBand( int Clock );
};
#define TRK (0<<6)
@@ -576,7 +576,7 @@
{
}
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0)
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0)
{
}
@@ -584,7 +584,7 @@
{
}
- long GetRealTimeClock()
+ int GetRealTimeClock()
{
return 0;
}
@@ -636,20 +636,20 @@
OutEvent(e, 1);
}
void OutBreak();
- void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
virtual void FlushToDevice();
void SetSoftThru(int on, int idev, int odev);
int FindMidiDevice();
protected:
- long play_clock;
- long recd_clock;
- long start_clock;
- long echo_clock;
+ int play_clock;
+ int recd_clock;
+ int start_clock;
+ int echo_clock;
JZOssThru *through;
int card_id;
Modified: trunk/jazz/src/PortMidiPlayer.cpp
===================================================================
--- trunk/jazz/src/PortMidiPlayer.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/PortMidiPlayer.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -401,7 +401,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZPortMidiPlayer::GetRealTimeClock()
+int JZPortMidiPlayer::GetRealTimeClock()
{
long t = Pt_Time();
Modified: trunk/jazz/src/PortMidiPlayer.h
===================================================================
--- trunk/jazz/src/PortMidiPlayer.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/PortMidiPlayer.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -36,7 +36,7 @@
void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- long GetRealTimeClock();
+ int GetRealTimeClock();
int Clock2Time(int clock);
int Time2Clock(int time);
void SetTempo(int bpm, int clock);
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -76,8 +76,8 @@
JZAudioListener(
JZWindowsAudioPlayer* pPlayer,
JZSample& spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
: wxTimer(),
mpPlayer(pPlayer),
mCount(0),
@@ -123,7 +123,7 @@
}
}
- long GetPlayPosition()
+ int GetPlayPosition()
{
MMTIME mmtime;
mmtime.wType = TIME_SAMPLES;
@@ -135,11 +135,11 @@
JZWindowsAudioPlayer* mpPlayer;
- long mCount;
+ int mCount;
bool mHardExit;
- long mChannels;
+ int mChannels;
};
//-----------------------------------------------------------------------------
@@ -556,13 +556,13 @@
res = waveOutGetPosition(hout, &mmtime, sizeof(mmtime));
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
- long time_now = (long)timeGetTime();
- long audio_now = (long)(
+ int time_now = (int)timeGetTime();
+ int audio_now = (int)(
(double)start_time + 1000.0 * mmtime.u.sample /
mSamples.GetSamplingRate());
// low pass filter for time-correction (not really necessary)
- const long low = 50;
+ const int low = 50;
mpState->time_correction =
(low * mpState->time_correction +
(100 - low) * (audio_now - time_now) ) / 100L;
@@ -609,13 +609,13 @@
res = waveInGetPosition(hinp, &mmtime, sizeof(mmtime));
if (res == MMSYSERR_NOERROR && mmtime.wType == TIME_SAMPLES)
{
- long time_now = (long)timeGetTime();
- long audio_now = (long)(
+ int time_now = (int)timeGetTime();
+ int audio_now = (int)(
(double)mpState->start_time + 1000.0 * mmtime.u.sample /
mSamples.GetSamplingRate());
// Low pass filter for time-correction (not really necessary).
- const long low = 50;
+ const int low = 50;
mpState->time_correction =
(low * mpState->time_correction +
(100 - low) * (audio_now - time_now)) / 100L;
@@ -631,7 +631,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsAudioPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZWindowsAudioPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
mSamples.StartPlay(Clock);
JZWindowsIntPlayer::StartPlay(Clock, LoopClock, Continue);
@@ -665,11 +665,11 @@
mSamples.StopPlay();
if (RecordMode())
{
- long frc = mpRecordingInfo->mFromClock;
+ int frc = mpRecordingInfo->mFromClock;
if (frc < start_clock)
frc = start_clock;
- long toc = mpRecordingInfo->mToClock;
- long play_clock = Time2Clock(mpState->play_time);
+ int toc = mpRecordingInfo->mToClock;
+ int play_clock = Time2Clock(mpState->play_time);
if (toc > play_clock)
toc = play_clock;
mSamples.SaveRecordingDlg(frc, toc, recbuffers);
@@ -712,8 +712,8 @@
//-----------------------------------------------------------------------------
void JZWindowsAudioPlayer::ListenAudio(
JZSample &spl,
- long fr_smpl,
- long to_smpl)
+ int fr_smpl,
+ int to_smpl)
{
if (!mAudioEnabled)
{
@@ -736,11 +736,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsAudioPlayer::GetListenerPlayPosition()
+int JZWindowsAudioPlayer::GetListenerPlayPosition()
{
if (!mpListener)
{
- return -1L;
+ return -1;
}
return mpListener->GetPlayPosition();
}
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -60,7 +60,7 @@
virtual void Notify();
- virtual void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
virtual void StopPlay();
@@ -83,9 +83,9 @@
virtual void ListenAudio(int key, int start_stop_mode = 1);
- virtual void ListenAudio(JZSample &spl, long fr_smpl, long to_smpl);
+ virtual void ListenAudio(JZSample &spl, int fr_smpl, int to_smpl);
- virtual long GetListenerPlayPosition();
+ virtual int GetListenerPlayPosition();
virtual bool IsListening() const
{
@@ -141,11 +141,11 @@
// A value of false means MIDI only.
bool mAudioEnabled;
- long blocks_played; // # of blocks written to device
+ int blocks_played; // # of blocks written to device
int play_buffers_needed; // driver requests more output buffers
- long start_clock; // when did play start
- long start_time; // play start time (not altered by SetTempo)
+ int start_clock; // when did play start
+ int start_time; // play start time (not altered by SetTempo)
JZAudioListener* mpListener;
HWAVEOUT hout;
Modified: trunk/jazz/src/mswin/WindowsConsole.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsConsole.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsConsole.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -40,7 +40,7 @@
void RedirectIoToConsole()
{
int hConHandle;
- long lStdHandle;
+ HANDLE lStdHandle;
CONSOLE_SCREEN_BUFFER_INFO coninfo;
FILE *fp;
@@ -57,22 +57,22 @@
coninfo.dwSize);
// redirect unbuffered STDOUT to the console
- lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "w");
*stdout = *fp;
setvbuf(stdout, NULL, _IONBF, 0);
// redirect unbuffered STDIN to the console
- lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_INPUT_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "r");
*stdin = *fp;
setvbuf(stdin, NULL, _IONBF, 0);
// redirect unbuffered STDERR to the console
- lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ lStdHandle = GetStdHandle(STD_ERROR_HANDLE);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
fp = _fdopen(hConHandle, "w");
*stderr = *fp;
setvbuf(stderr, NULL, _IONBF, 0);
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -156,9 +156,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -215,7 +215,7 @@
(void)state->thru_buffer.get();
}
- state->play_time = (long)timeGetTime() + state->time_correction;
+ state->play_time = (int)timeGetTime() + state->time_correction;
midi_event* m = state->play_buffer.peek();
while (m)
@@ -253,15 +253,15 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (long)m->ref - (long)state->play_time;
+ delay = (int)m->ref - (int)state->play_time;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
state->min_timer_period,
@@ -279,9 +279,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -348,9 +348,9 @@
(void)state->thru_buffer.get();
}
- state->play_time = (long)timeGetTime();
+ state->play_time = (int)timeGetTime();
/* How many ticks since last signal? */
- long delta_clock = ((state->play_time - state->signal_time) * 1000L) / state->time_per_tick;
+ int delta_clock = ((state->play_time - state->signal_time) * 1000L) / state->time_per_tick;
if (delta_clock > (2 * state->ticks_per_signal)) /* Too many? */
{
@@ -364,7 +364,7 @@
midi_event *m = state->play_buffer.peek();
while (m)
{
- if ((long)m->ref > state->play_clock)
+ if ((int)m->ref > state->play_clock)
break;
if (m->data)
@@ -391,16 +391,16 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (((long)m->ref - state->play_clock) * state->time_per_tick) / 1000L;
+ delay = (((int)m->ref - state->play_clock) * state->time_per_tick) / 1000L;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
@@ -419,9 +419,9 @@
DWORD dwParam2)
{
tWinPlayerState *state = (tWinPlayerState *)dwInstance;
- long now;
+ int now;
- now = (long)timeGetTime();
+ now = (int)timeGetTime();
switch (wMsg)
{
@@ -476,7 +476,7 @@
state->mtc_start.type = ((u.c[1] & 0x06) >> 1);
if (state->qfm_bits == 0xff)
{
- long mtc_time;
+ int mtc_time;
state->signal_time = now;
Mtc2Frames( state );
GetMtcTime( state, mtc_time );
@@ -495,7 +495,7 @@
{
if (state->mtc_valid)
{
- long mtc_time;
+ int mtc_time;
GetMtcTime( state, mtc_time );
state->recd_buffer.put(dwParam1, mtc_time + (now - state->signal_time) );
}
@@ -549,7 +549,7 @@
(void)state->thru_buffer.get();
}
- long now = (long)timeGetTime();
+ int now = (int)timeGetTime();
if ( state->mtc_valid )
{
GetMtcTime( state, state->play_time );
@@ -592,15 +592,15 @@
}
// compute delta time for next interrupt
- long delay = 100; // default in millisec
+ int delay = 100; // default in millisec
if (m)
{
- delay = (long)m->ref - (long)state->play_time;
+ delay = (int)m->ref - (int)state->play_time;
}
- if (delay < (long)state->min_timer_period)
- delay = (long)state->min_timer_period;
- else if (delay > (long)state->max_timer_period)
- delay = (long)state->max_timer_period;
+ if (delay < (int)state->min_timer_period)
+ delay = (int)state->min_timer_period;
+ else if (delay > (int)state->max_timer_period)
+ delay = (int)state->max_timer_period;
timeSetEvent(
(UINT) delay,
state->min_timer_period,
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -320,16 +320,16 @@
HMIDIIN hinp;
HMIDIOUT hout;
- long start_time;
- long play_time;
- long start_clock;
- long ticks_per_minute;
+ int start_time;
+ int play_time;
+ int start_clock;
+ int ticks_per_minute;
- long play_clock;
- long virtual_clock;
- long ticks_per_signal;
- long signal_time;
- long time_per_tick;
+ int play_clock;
+ int virtual_clock;
+ int ticks_per_signal;
+ int signal_time;
+ int time_per_tick;
tWinPlayerMtcTime mtc_start;
DWORD mtc_frames;
@@ -349,7 +349,7 @@
JZMidiQueue thru_buffer;
JZWindowsAudioPlayer* audio_player;
- long time_correction;
+ int time_correction;
JZWinSysexBufferArray* isx_buffers;
JZWinSysexBufferArray* osx_buffers;
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 04:11:58 UTC (rev 907)
@@ -369,21 +369,21 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Clock2Time(long clock)
+int JZWindowsPlayer::Clock2Time(int clock)
{
if (clock < mpState->start_clock)
return mpState->start_time;
- return (long)( (double)(clock - mpState->start_clock) * 60000.0 /
+ return (int)( (double)(clock - mpState->start_clock) * 60000.0 /
(double)mpState->ticks_per_minute + mpState->start_time);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Time2Clock(long time)
+int JZWindowsPlayer::Time2Clock(int time)
{
if (time < mpState->start_time)
return mpState->start_clock;
- return (long)(
+ return (int)(
(double)(time - mpState->start_time) *
(double)mpState->ticks_per_minute / 60000.0 +
mpState->start_clock);
@@ -391,30 +391,30 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::SetTempo(long bpm, long clock)
+void JZWindowsPlayer::SetTempo(int bpm, int clock)
{
- long t1 = Clock2Time(clock);
- mpState->ticks_per_minute = (long)bpm * (long)mpSong->GetTicksPerQuarter();
- long t2 = Clock2Time(clock);
+ int t1 = Clock2Time(clock);
+ mpState->ticks_per_minute = (int)bpm * (int)mpSong->GetTicksPerQuarter();
+ int t2 = Clock2Time(clock);
mpState->start_time += (t1 - t2);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::RealTimeClock2Time(long clock)
+int JZWindowsPlayer::RealTimeClock2Time(int clock)
{
if (clock < mpState->start_clock)
return real_start_time;
- return (long)( (double)(clock - mpState->start_clock) * 60000.0 / (double)real_ticks_per_minute + real_start_time);
+ return (int)( (double)(clock - mpState->start_clock) * 60000.0 / (double)real_ticks_per_minute + real_start_time);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsPlayer::Time2RealTimeClock(long time)
+int JZWindowsPlayer::Time2RealTimeClock(int time)
{
if (time < real_start_time)
return mpState->start_clock;
- return (long)(
+ return (int)(
(double)(time - real_start_time) *
(double)real_ticks_per_minute / 60000.0 +
mpState->start_clock);
@@ -422,11 +422,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::SetRealTimeTempo(long bpm, long clock)
+void JZWindowsPlayer::SetRealTimeTempo(int bpm, int clock)
{
- long t1 = RealTimeClock2Time(clock);
- real_ticks_per_minute = (long)bpm * (long)mpSong->GetTicksPerQuarter();
- long t2 = RealTimeClock2Time(clock);
+ int t1 = RealTimeClock2Time(clock);
+ real_ticks_per_minute = (int)bpm * (int)mpSong->GetTicksPerQuarter();
+ int t2 = RealTimeClock2Time(clock);
real_start_time += (t1 - t2);
}
@@ -532,7 +532,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::FillMidiClocks(long to)
+void JZWindowsPlayer::FillMidiClocks(int to)
{
while (midiClockOut <= to)
{
@@ -545,7 +545,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::OutBreak(long clock)
+void JZWindowsPlayer::OutBreak(int clock)
{
if (gpConfig->GetValue(C_RealTimeOut))
{
@@ -560,7 +560,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsMidiPlayer::OutBreak(long clock)
+void JZWindowsMidiPlayer::OutBreak(int clock)
{
if (gpConfig->GetValue(C_RealTimeOut))
{
@@ -607,7 +607,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::StartPlay(long Clock, long LoopClock, int Continue)
+void JZWindowsPlayer::StartPlay(int Clock, int LoopClock, int Continue)
{
mpState->play_buffer.clear();
mpState->recd_buffer.clear();
@@ -637,7 +637,7 @@
}
else
{
- mpState->start_time = (long)timeGetTime() + 500;
+ mpState->start_time = (int)timeGetTime() + 500;
real_start_time = mpState->start_time;
mpState->start_clock = Clock;
}
@@ -800,7 +800,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZWindowsPlayer::FlushToDevice(long clock)
+void JZWindowsPlayer::FlushToDevice(int clock)
{
JZEventIterator Iterator(&mPlayBuffer);
JZEvent* pEvent = Iterator.Range(0, clock);
@@ -819,7 +819,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsIntPlayer::GetRealTimeClock()
+int JZWindowsIntPlayer::GetRealTimeClock()
{
while (!mpState->recd_buffer.empty())
{
@@ -834,8 +834,8 @@
}
}
- long clock = Time2RealTimeClock(
- (long)timeGetTime() + mpState->time_correction);
+ int clock = Time2RealTimeClock(
+ (int)timeGetTime() + mpState->time_correction);
JZProjectManager::Instance()->NewPlayPosition(
mpPlayLoop->Ext2IntClock(clock / 48 * 48));
@@ -865,9 +865,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsMidiPlayer::GetRealTimeClock()
+int JZWindowsMidiPlayer::GetRealTimeClock()
{
- long clock;
+ int clock;
while (!mpState->recd_buffer.empty())
{
@@ -889,7 +889,7 @@
gpMidiPlayer->StopPlay();
u.w = m->data;
clock =
- ((long)u.c[1] + (128L * (long)u.c[2])) *
+ ((int)u.c[1] + (128L * (int)u.c[2])) *
(mpSong->GetTicksPerQuarter() / 4);
gpMidiPlayer->StartPlay( clock, 0, 1 );
return -1;
@@ -904,7 +904,7 @@
}
}
- long delta_clock = (((long)timeGetTime() - mpState->signal_time) * 1000L) / mpState->time_per_tick;
+ int delta_clock = (((int)timeGetTime() - mpState->signal_time) * 1000L) / mpState->time_per_tick;
if (delta_clock > (2 * mpState->ticks_per_signal))
{
@@ -923,9 +923,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-long JZWindowsMtcPlayer::GetRealTimeClock()
+int JZWindowsMtcPlayer::GetRealTimeClock()
{
- long clock;
+ int clock;
while (!mpState->recd_buffer.empty())
{
@@ -951,7 +951,7 @@
if (mpState->mtc_valid)
{
- if ( ((long)timeGetTime() - mpState->signal_time) > 500 )
+ if ( ((int)timeGetTime() - mpState->signal_time) > 500 )
{
/* Assume tape stopped */
disable();
@@ -1017,7 +1017,7 @@
StopPlay();
mpState->doing_mtc_rec = FALSE;
return(new JZMtcTime(
- (long) GetMtcTime(mpState),
+ (int) GetMtcTime(mpState),
(tMtcType) mpState->mtc_start.type));
}
Modified: trunk/jazz/src/mswin/WindowsPlayer.h
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.h 2011-08-08 01:09:19 UTC (rev 906)
+++ trunk/jazz/src/mswin/WindowsPlayer.h 2011-08-08 04:11:58 UTC (rev 907)
@@ -47,10 +47,10 @@
void OutNow(JZEvent *e);
void OutNow(JZParam *r);
void OutBreak();
- virtual void OutBreak(long BreakOver);
- void StartPlay(long Clock, long LoopClock = 0, int Continue = 0);
+ virtual void OutBreak(int BreakOver);
+ void StartPlay(int Clock, int LoopClock = 0, int Continue = 0);
void StopPlay();
- virtual long GetRealTimeClock() = 0;
+ virtual int GetRealTimeClock() = 0;
virtual void FlushToDevice();
void SetSoftThru(int on, int InputDevice, int OutputDevice);
@@ -75,21 +75,21 @@
tWinPlayerState* mpState;
DWORD Event2Dword(JZEvent *e);
JZEvent* Dword2Event(DWORD dw);
- long Clock2Time(long clock);
- long Time2Clock(long time);
- void SetTempo(long bpm, long clock);
+ int Clock2Time(int clock);
+ int Time2Clock(int time);
+ void SetTempo(int bpm, int clock);
BOOL timer_installed;
- long midiClockOut;
- long lastValidMtcClock;
- void FillMidiClocks(long to);
- void FlushToDevice(long clock);
+ int midiClockOut;
+ int lastValidMtcClock;
+ void FillMidiClocks(int to);
+ void FlushToDevice(int clock);
JZEventArray OutOfBandEvents;
- long RealTimeClock2Time(long clock);
- long Time2RealTimeClock(long time);
- void SetRealTimeTempo(long bpm, long clock);
- long real_start_time;
- long real_ticks_per_minute;
+ int RealTimeClock2Time(int clock);
+ int Time2RealTimeClock(int time);
+ void SetRealTimeTempo(int bpm, int clock);
+ int real_start_time;
+ int real_ticks_per_minute;
// buffer for sysexdata
HANDLE hSysHdr;
@@ -110,7 +110,7 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
};
//*****************************************************************************
@@ -124,9 +124,9 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
virtual int OutEvent(JZEvent* pEvent);
- virtual void OutBreak(long clock);
+ virtual void OutBreak(int clock);
};
//*****************************************************************************
@@ -139,7 +139,7 @@
{
}
- virtual long GetRealTimeClock();
+ virtual int GetRealTimeClock();
virtual void InitMtcRec();
virtual JZMtcTime* FreezeMtcRec();
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 01:09:25
|
Revision: 906
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=906&view=rev
Author: pstieber
Date: 2011-08-08 01:09:19 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
1. Fixed incorrect pointer casts from DWORD to DWORD_PTR in calls to waveInOpen and waveOutOpen.
This fixed a crash in the Windows 64-bit build.
2. Made many cosmetic changes.
Modified Paths:
--------------
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 00:53:58 UTC (rev 905)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2011-08-08 01:09:19 UTC (rev 906)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2011 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
@@ -30,10 +30,9 @@
#include <wx/msgdlg.h>
-// not sure if mutex may cause a dead lock when used to
-// synchronize the wxTimer::Notify() interrupt and the
-// low level midi interrupt, as these are not mswin threads.
-// As far as I can see, the mutex is not needed anyway.
+// I'm not sure if a mutex may cause a dead lock when used to synchronize the
+// wxTimer::Notify() interrupt and the low-level midi interrupt, as these are
+// not mswin threads. As far as I can see, the mutex is not needed anyway.
// IMPORTANT: enabling critical sections freezes NT!
@@ -43,12 +42,12 @@
#define LeaveCriticalSection(a)
#define DeleteCriticalSection(a)
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+//*****************************************************************************
+// Description:
+// Class to play a sample from the piano roll.
+//*****************************************************************************
class JZAudioListener : public wxTimer
{
- // play a sample from piano roll
-
public:
JZAudioListener(JZWindowsAudioPlayer* pPlayer, int key)
@@ -173,7 +172,7 @@
if (OpenDsp() == 0)
{
- // check output device capabilities
+ // Check output device capabilities.
WAVEOUTCAPS ocaps;
MMRESULT res = waveOutGetDevCaps((UINT)hout, &ocaps, sizeof(ocaps));
if (res != MMSYSERR_NOERROR)
@@ -265,7 +264,8 @@
int i;
MMRESULT res;
- mErrorCode = NoError; // everything ok for now.
+ // Everything is OK for now.
+ mErrorCode = NoError;
if (!mAudioEnabled)
{
@@ -285,7 +285,7 @@
fmt.wBitsPerSample = 16;
fmt.cbSize = 0;
- blocks_played = 0;
+ blocks_played = 0;
play_buffers_needed = 0;
record_buffers_needed = 0;
@@ -297,8 +297,8 @@
&hout,
WAVE_MAPPER,
&fmt,
- (DWORD)audioInterrupt,
- (DWORD)this,
+ (DWORD_PTR)audioInterrupt,
+ (DWORD_PTR)this,
CALLBACK_FUNCTION);
if (res != MMSYSERR_NOERROR)
@@ -307,7 +307,7 @@
return 1;
}
- // prepare headers
+ // Prepare the headers.
for (i = 0; i < BUFCOUNT; i++)
{
JZAudioBuffer* buf = mSamples.GetBuffer(i);
@@ -315,9 +315,11 @@
memset(hdr, 0, sizeof(WAVEHDR));
buf->hdr = hdr;
- hdr->lpData = (char *)buf->Data();
- hdr->dwBufferLength = BUFBYTES; // length, in bytes, of the buffer
+ hdr->lpData = (char *)buf->Data();
+ // Length, in bytes, of the buffer.
+ hdr->dwBufferLength = BUFBYTES;
+
res = waveOutPrepareHeader(hout, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR)
{
@@ -333,29 +335,41 @@
hinp = 0;
recbuffers.Clear();
- res = waveInOpen(&hinp, WAVE_MAPPER, &fmt, (DWORD)audioInterrupt, (DWORD)this, CALLBACK_FUNCTION);
+ res = waveInOpen(
+ &hinp,
+ WAVE_MAPPER,
+ &fmt,
+ (DWORD_PTR)audioInterrupt,
+ (DWORD_PTR)this,
+ CALLBACK_FUNCTION);
if (res != MMSYSERR_NOERROR)
{
mErrorCode = ErrInpOpen;
return 1;
}
- // prepare headers and add them to recording device
+ // Prepare headers and add them to recording device.
for (i = 0; i < BUFCOUNT; i++)
{
WAVEHDR *hdr = new WAVEHDR;
memset(hdr, 0, sizeof(WAVEHDR));
JZAudioBuffer* buf = recbuffers.RequestBuffer();
- buf->hdr = hdr;
+ buf->hdr = hdr;
- hdr->lpData = (LPSTR)buf->data;
- hdr->dwBufferLength = BUFBYTES; // length, in bytes, of the buffer
- hdr->dwFlags = 0; // see below
+ hdr->lpData = (LPSTR)buf->data;
+ // length, in bytes, of the buffer
+ hdr->dwBufferLength = BUFBYTES;
+
+ // See below.
+ hdr->dwFlags = 0;
+
res = waveInPrepareHeader(hinp, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR)
+ {
return 1;
+ }
res = waveInAddBuffer(hinp, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR)
@@ -365,7 +379,6 @@
}
}
hinp_open = 1;
-
}
return 0;
@@ -527,7 +540,9 @@
if (hout_open)
{
mSamples.FillBuffers(mOutClock);
- if (play_buffers_needed > 0) // dont trigger start play by accident
+
+ // Don't trigger a start play by accident.
+ if (play_buffers_needed > 0)
{
WriteBuffers();
}
@@ -549,18 +564,18 @@
// 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;
+ (low * mpState->time_correction +
+ (100 - low) * (audio_now - time_now) ) / 100L;
}
}
}
-
if (hinp_open)
{
while (record_buffers_needed > 0)
{
- // add a new record buffer
+ // Add a new record buffer.
WAVEHDR *hdr = new WAVEHDR;
memset(hdr, 0, sizeof(WAVEHDR));
@@ -568,7 +583,10 @@
buf->hdr = hdr;
hdr->lpData = (LPSTR)buf->data;
- hdr->dwBufferLength = BUFBYTES; // length, in bytes, of the buffer
+
+ // Length, in bytes, of the buffer.
+ hdr->dwBufferLength = BUFBYTES;
+
hdr->dwFlags = 0;
if (waveInPrepareHeader(hinp, hdr, sizeof(WAVEHDR)) == MMSYSERR_NOERROR)
@@ -598,7 +616,9 @@
// 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;
+ mpState->time_correction =
+ (low * mpState->time_correction +
+ (100 - low) * (audio_now - time_now)) / 100L;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 00:54:04
|
Revision: 905
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=905&view=rev
Author: pstieber
Date: 2011-08-08 00:53:58 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
1. Changed dev to DeviceId.
2. Fixed incorrect pointer casts from DWORD to DWORD_PTR in calls to midiInOpen and midiOutOpen.
This fixed a crash in the Windows 64-bit build.
Modified Paths:
--------------
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 00:13:55 UTC (rev 904)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-08 00:53:58 UTC (rev 905)
@@ -81,24 +81,24 @@
// select input device
if (ilong >= 0)
{
- UINT dev = (UINT)ilong;
+ UINT DeviceId = (UINT)ilong;
UINT rc;
switch (gpConfig->GetValue(C_ClockSource))
{
case CsMidi:
rc = midiInOpen(
&mpState->hinp,
- dev,
- (DWORD)midiMidiInputHandler,
- (DWORD)mpState,
+ DeviceId,
+ (DWORD_PTR)midiMidiInputHandler,
+ (DWORD_PTR)mpState,
CALLBACK_FUNCTION);
break;
case CsMtc:
rc = midiInOpen(
&mpState->hinp,
- dev,
- (DWORD)midiMtcInputHandler,
- (DWORD)mpState,
+ DeviceId,
+ (DWORD_PTR)midiMtcInputHandler,
+ (DWORD_PTR)mpState,
CALLBACK_FUNCTION);
break;
case CsInt:
@@ -106,9 +106,9 @@
default:
rc = midiInOpen(
&mpState->hinp,
- dev,
- (DWORD)midiIntInputHandler,
- (DWORD)mpState,
+ DeviceId,
+ (DWORD_PTR)midiIntInputHandler,
+ (DWORD_PTR)mpState,
CALLBACK_FUNCTION);
break;
}
@@ -123,16 +123,18 @@
// select output device
if (olong >= 0)
{
- UINT dev = (UINT)olong;
- if (dev == MAX_MIDI_DEVS)
- dev = MIDI_MAPPER;
+ UINT DeviceId = (UINT)olong;
+ if (DeviceId == MAX_MIDI_DEVS)
+ {
+ DeviceId = MIDI_MAPPER;
+ }
- //UINT rc = midiOutOpen(&mpState->hout, dev, 0L, 0L, 0L);
+ //UINT rc = midiOutOpen(&mpState->hout, DeviceId, 0L, 0L, 0L);
UINT rc = midiOutOpen(
&mpState->hout,
- dev,
- (DWORD)MidiOutProc,
- (DWORD)mpState,
+ DeviceId,
+ (DWORD_PTR)MidiOutProc,
+ (DWORD_PTR)mpState,
CALLBACK_FUNCTION);
if (rc)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 00:14:01
|
Revision: 904
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=904&view=rev
Author: pstieber
Date: 2011-08-08 00:13:55 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Added empty input line tests.
Modified Paths:
--------------
trunk/jazz/src/Configuration.cpp
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2011-08-08 00:13:00 UTC (rev 903)
+++ trunk/jazz/src/Configuration.cpp 2011-08-08 00:13:55 UTC (rev 904)
@@ -869,7 +869,7 @@
break;
}
}
- else if (pVector && isdigit(InputLine[0]))
+ else if (pVector && !InputLine.empty() && isdigit(InputLine[0]))
{
// Read named entries.
@@ -985,7 +985,11 @@
::wxMessageBox(String, "Warning", wxOK);
}
}
- else if (pVector == 0 && !mBankTable.empty()&& isdigit(InputLine[0]))
+ else if (
+ pVector == 0 &&
+ !mBankTable.empty() &&
+ !InputLine.empty() &&
+ isdigit(InputLine[0]))
{
// Read bank table entries.
assert(0 <= BankIndex && BankIndex < mBankTable.size());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-08 00:13:06
|
Revision: 903
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=903&view=rev
Author: pstieber
Date: 2011-08-08 00:13:00 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Made updates to the frequency table code.
Modified Paths:
--------------
trunk/jazz/src/FrequencyTable.cpp
trunk/jazz/src/FrequencyTable.h
trunk/jazz/src/Signal2.cpp
Modified: trunk/jazz/src/FrequencyTable.cpp
===================================================================
--- trunk/jazz/src/FrequencyTable.cpp 2011-08-07 23:17:05 UTC (rev 902)
+++ trunk/jazz/src/FrequencyTable.cpp 2011-08-08 00:13:00 UTC (rev 903)
@@ -27,27 +27,31 @@
using namespace std;
-FreqTab::FreqTab()
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZFrequencyTable::JZFrequencyTable()
{
- double fac = pow(2.0, 1.0 / 12.0);
- double frq = 440 * pow(fac, 3.0) / 32.0;
- tab.reserve(128);
- for (int i = 0; i < 128; i++)
+ double Factor = pow(2.0, 1.0 / 12.0);
+ double Frequency = 440 * pow(Factor, 3.0) / 32.0;
+ mFrequencyTable.reserve(128);
+ for (int i = 0; i < 128; ++i)
{
- tab.push_back(frq);
- frq *= fac;
+ mFrequencyTable.push_back(Frequency);
+ Frequency *= Factor;
}
}
-inline double dabs(double a, double b)
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+size_t JZFrequencyTable::GetKey(double Frequency)
{
- return a > b ? a - b : b - a;
-}
+ // Do a binary search.
+ vector<double>::iterator Position =
+ lower_bound(mFrequencyTable.begin(), mFrequencyTable.end(), Frequency);
-int FreqTab::key(double f)
-{
- // do a binary search
- vector<double>::iterator pos = lower_bound(tab.begin(), tab.end(), f);
- // todo: if f is only a very little bigger than *pos, f is nearer to pos-1
- return pos - tab.begin();
+ // TODO: If Frequency is only a very little bigger than *Position, Frequency
+ // is nearer to Position - 1.
+ return Position - mFrequencyTable.begin();
}
Modified: trunk/jazz/src/FrequencyTable.h
===================================================================
--- trunk/jazz/src/FrequencyTable.h 2011-08-07 23:17:05 UTC (rev 902)
+++ trunk/jazz/src/FrequencyTable.h 2011-08-08 00:13:00 UTC (rev 903)
@@ -25,22 +25,24 @@
#include <vector>
-class FreqTab
+//*****************************************************************************
+//*****************************************************************************
+class JZFrequencyTable
{
public:
- FreqTab();
+ JZFrequencyTable();
- int key(double frq);
+ size_t GetKey(double Frequency);
- double freq(int key) const
+ double GetFrequency(int Key) const
{
- return tab[key];
+ return mFrequencyTable[Key];
}
private:
- std::vector<double> tab;
+ std::vector<double> mFrequencyTable;
};
#endif // !defined(JZ_FREQUENCYTABLE_H)
Modified: trunk/jazz/src/Signal2.cpp
===================================================================
--- trunk/jazz/src/Signal2.cpp 2011-08-07 23:17:05 UTC (rev 902)
+++ trunk/jazz/src/Signal2.cpp 2011-08-08 00:13:00 UTC (rev 903)
@@ -190,20 +190,20 @@
}
void sig_wavsynth(
- JZSample &spl, // destin
- double duration, // length in seconds
- int midi_key, // base frequency
+ JZSample &spl, // destin
+ double duration, // length in seconds
+ int midi_key, // base frequency
double fshift, // frequeny modulation factor, 0 = off
- int ntables, // number of wavetables to be mixed
- JZRndArray *arr[][4], // (fft, vol, pitch, pan) * N
+ int ntables, // number of wavetables to be mixed
+ JZRndArray *arr[][4], // (fft, vol, pitch, pan) * N
int noisegen // first array is noise filter
)
{
long sr = spl.GetSamplingRate();
long ch = spl.GetChannelCount();
JZSigSynth synth(sr, ch);
- FreqTab ft;
- double freq = ft.freq(midi_key);
+ JZFrequencyTable FrequencyTable;
+ double freq = FrequencyTable.GetFrequency(midi_key);
JZFloatSample obuf(ch, sr);
tFloatIter *osig = new tFloatIter(synth, obuf);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-07 23:17:11
|
Revision: 902
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=902&view=rev
Author: pstieber
Date: 2011-08-07 23:17:05 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Fixed a memory leak.
Modified Paths:
--------------
trunk/jazz/src/EventWindow.cpp
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2011-08-07 23:15:45 UTC (rev 901)
+++ trunk/jazz/src/EventWindow.cpp 2011-08-07 23:17:05 UTC (rev 902)
@@ -586,6 +586,7 @@
Refresh();
}
+ delete mpMouseAction;
mpMouseAction = 0;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-07 23:15:51
|
Revision: 901
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=901&view=rev
Author: pstieber
Date: 2011-08-07 23:15:45 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Made a bunch of cosmetic updates.
Modified Paths:
--------------
trunk/jazz/src/PianoWindow.cpp
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2011-08-07 21:49:22 UTC (rev 900)
+++ trunk/jazz/src/PianoWindow.cpp 2011-08-07 23:15:45 UTC (rev 901)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2011 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
@@ -216,7 +216,8 @@
if (!mPitch)
{
- return 1; // done
+ // Done.
+ return 1;
}
return 0;
}
@@ -865,9 +866,17 @@
///////////////////////////////////////////////////////////////
// horizontal lines(ripped from drawpianoroll code)
-// for (y = TrackIndex2y(mFromLine); y < mEventsY + mEventsHeight; y += mTrackHeight)
-// if (y > mEventsY) // cheaper than clipping
-// LocalDc.DrawLine(mEventsX+1, y, mEventsX + mEventsWidth, y);
+// for (
+// y = TrackIndex2y(mFromLine);
+// y < mEventsY + mEventsHeight;
+// y += mTrackHeight)
+// {
+// // cheaper than clipping
+// if (y > mEventsY)
+// {
+// LocalDc.DrawLine(mEventsX+1, y, mEventsX + mEventsWidth, y);
+// }
+// }
LocalDc.SetPen(*wxGREY_PEN);
wxBrush blackKeysBrush = wxBrush(wxColor(250, 240, 240), wxSOLID);
@@ -928,9 +937,16 @@
Oss << BarInfo.GetBarIndex() + 1 - intro;
if (x > mEventsX)
{
- LocalDc.DrawText(Oss.str().c_str(), x + mLittleBit, mEventsY - mFixedFontHeight - 2);
+ LocalDc.DrawText(
+ Oss.str().c_str(),
+ x + mLittleBit,
+ mEventsY - mFixedFontHeight - 2);
LocalDc.SetPen(*wxGREY_PEN);
- LocalDc.DrawLine(x, mEventsY - mFixedFontHeight, x, mEventsY + mEventsHeight);
+ LocalDc.DrawLine(
+ x,
+ mEventsY - mFixedFontHeight,
+ x,
+ mEventsY + mEventsHeight);
}
LocalDc.SetPen(*wxLIGHT_GREY_PEN);
@@ -967,7 +983,11 @@
sbrush.SetColour(230,255,230);
#endif
-// LocalDc.SetClippingRegion(mEventsX, mEventsY, mEventsWidth, mEventsHeight);
+// LocalDc.SetClippingRegion(
+// mEventsX,
+// mEventsY,
+// mEventsWidth,
+// mEventsHeight);
LocalDc.SetLogicalFunction(wxXOR);
LocalDc.SetPen(*wxTRANSPARENT_PEN);
@@ -1013,7 +1033,9 @@
while (pitch < 127)
{
int y = Pitch2y(pitch);
- if (y >= mEventsY && y <= mEventsY + mEventsHeight - h) // y-clipping
+
+ // Perform y-clipping.
+ if (y >= mEventsY && y <= mEventsY + mEventsHeight - h)
{
LocalDc.DrawRectangle(x, y, w, h);
}
@@ -1330,17 +1352,28 @@
{
Dc.DrawLine(0, y + mTrackHeight, mPianoWidth, y + mTrackHeight);
Dc.SetPen(*wxWHITE_PEN);
- Dc.DrawLine(0, y + mTrackHeight + 1, mPianoWidth, y + mTrackHeight + 1);
+ Dc.DrawLine(
+ 0,
+ y + mTrackHeight + 1,
+ mPianoWidth,
+ y + mTrackHeight + 1);
Dc.SetPen(*wxBLACK_PEN);
ostringstream Oss;
Oss << Pitch / 12;
- Dc.DrawText(Oss.str().c_str(), wBlack + mLittleBit, y + mTrackHeight / 2);
+ Dc.DrawText(
+ Oss.str().c_str(),
+ wBlack + mLittleBit,
+ y + mTrackHeight / 2);
}
else if (!IsBlack(Pitch - 1))
{
Dc.DrawLine(0, y + mTrackHeight, mPianoWidth, y + mTrackHeight);
Dc.SetPen(*wxWHITE_PEN);
- Dc.DrawLine(0, y + mTrackHeight + 1, mPianoWidth, y + mTrackHeight + 1);
+ Dc.DrawLine(
+ 0,
+ y + mTrackHeight + 1,
+ mPianoWidth,
+ y + mTrackHeight + 1);
Dc.SetPen(*wxBLACK_PEN);
}
@@ -1631,8 +1664,9 @@
}
//-----------------------------------------------------------------------------
-// Draws the a 3D button with text in it. Used to draw the little area in the
-// top left of the window.
+// Description:
+// Draws the a 3D button with text in it. Used to draw the little area in
+// the top left of the window.
//-----------------------------------------------------------------------------
void JZPianoWindow::LineText(
wxDC& Dc,
@@ -1917,7 +1951,8 @@
}
//-----------------------------------------------------------------------------
-// Snapper
+// Description:
+// Snapper
//-----------------------------------------------------------------------------
void JZPianoWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
{
@@ -2314,12 +2349,12 @@
r.SetWidth(mPianoWidth - 2 * mLittleBit);
r.SetHeight(mTopInfoHeight);
- JZVelocityCounter *VelocCounter = new JZVelocityCounter(this, &r, pKeyOn);
- VelocCounter->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
- mpMouseAction = VelocCounter;
+ JZVelocityCounter* pVelocCounter =
+ new JZVelocityCounter(this, &r, pKeyOn);
+ pVelocCounter->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
+ mpMouseAction = pVelocCounter;
}
break;
-
}
}
}
@@ -2342,7 +2377,8 @@
}
//-----------------------------------------------------------------------------
-// This is an event handler for JZMouseCounter.
+// Description:
+// This is an event handler for JZMouseCounter.
//-----------------------------------------------------------------------------
void JZPianoWindow::ButtonLabelDisplay(const wxString& Text, bool IsButtonDown)
{
@@ -2397,9 +2433,9 @@
(pTrack->Channel == gpConfig->GetValue(C_DrumChannel));
}
-// ********************************************************************
+//=============================================================================
// Utilities
-// ********************************************************************
+//=============================================================================
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -2471,7 +2507,8 @@
}
//-----------------------------------------------------------------------------
-// If Pitch == -1: search for any pitches.
+// Description:
+// If Pitch == -1: search for any pitches.
//-----------------------------------------------------------------------------
JZEvent *JZPianoWindow::FindEvent(JZTrack* pTrack, int Clock, int Pitch)
{
@@ -2603,13 +2640,15 @@
}
//-----------------------------------------------------------------------------
-// positions for controller editor
+// Description:
+// Positions for controller editor.
//-----------------------------------------------------------------------------
#define CtrlH(h) ((h)/4)
#define CtrlY(h) (h - CtrlH(h))
//-----------------------------------------------------------------------------
-// Activate velocity edit.
+// Description:
+// Activate velocity edit.
//-----------------------------------------------------------------------------
void JZPianoWindow::CtrlVelocity()
{
@@ -2841,7 +2880,8 @@
}
//-----------------------------------------------------------------------------
-// Undo actions
+// Description:
+// Undo actions
//-----------------------------------------------------------------------------
void JZPianoWindow::Undo()
{
@@ -2854,20 +2894,28 @@
}
//-----------------------------------------------------------------------------
-// Quantize selected events.
+// Description:
+// Quantize selected events.
//-----------------------------------------------------------------------------
void JZPianoWindow::Quantize()
{
if (EventsSelected())
{
- JZCommandQuantize QuantizeCommand(mpFilter, SnapClocks(), true, false, 0, 0);
+ JZCommandQuantize QuantizeCommand(
+ mpFilter,
+ SnapClocks(),
+ true,
+ false,
+ 0,
+ 0);
QuantizeCommand.Execute(1);
Refresh();
}
}
//-----------------------------------------------------------------------------
-// Flip events up and down.
+// Description:
+// Flip events up and down.
//-----------------------------------------------------------------------------
void JZPianoWindow::ExchangeUpDown()
{
@@ -2880,7 +2928,8 @@
}
//-----------------------------------------------------------------------------
-// Flip events left to right.
+// Description:
+// Flip events left to right.
//-----------------------------------------------------------------------------
void JZPianoWindow::ExchangeLeftRight()
{
@@ -2893,7 +2942,8 @@
}
//-----------------------------------------------------------------------------
-// Shift events snapclock clocks to left.
+// Description:
+// Shift events snapclock clocks to left.
//-----------------------------------------------------------------------------
void JZPianoWindow::ShiftLeft()
{
@@ -2907,7 +2957,8 @@
}
//-----------------------------------------------------------------------------
-// Shift events snapclock clocks to right.
+// Description:
+// Shift events snapclock clocks to right.
//-----------------------------------------------------------------------------
void JZPianoWindow::ShiftRight()
{
@@ -2921,7 +2972,8 @@
}
//-----------------------------------------------------------------------------
-// helper for cut and copy events
+// Description:
+// This is a helper function for cut and copy events.
//-----------------------------------------------------------------------------
void JZPianoWindow::CutOrCopy(int Id)
{
@@ -3228,77 +3280,72 @@
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateSettingsDialog()
{
-/*
- jppResourceDialog Dialog(this, "windowSettings");
-
- Dialog.Attach("use_colours", &mUseColors);
- Dialog.Attach("font_size", &mFontSize, mPianoFontSizes);
-
- if (Dialog.ShowModal() == wxID_OK)
- {
- Setup();
- SetScrollRanges();
- Refresh();
- }
-*/
+// jppResourceDialog Dialog(this, "windowSettings");
+//
+// Dialog.Attach("use_colours", &mUseColors);
+// Dialog.Attach("font_size", &mFontSize, mPianoFontSizes);
+//
+// if (Dialog.ShowModal() == wxID_OK)
+// {
+// Setup();
+// SetScrollRanges();
+// Refresh();
+// }
}
//-----------------------------------------------------------------------------
-// This is a test to see how to implement a dialog with Patrick's system.
+// Description:
+// This is a test to see how to implement a dialog with Patrick's system.
// It replaces JZMidiDelayDlg, which isnt necesarily a good idea.
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateMidiDelayDialog()
{
-/*
- if (!EventsSelected())
- {
- return;
- }
-
- int scale = 50; //in percent
- int clockDelay = 10;
- int repeat = 6;
-
- jppResourceDialog dialog(this, "midiDelay");
-
- dialog.Attach("scale", &scale);
- dialog.Attach("clockDelay", &clockDelay);
- dialog.Attach("repeat", &repeat);
-
- if (dialog.ShowModal() == wxID_OK)
- {
- //execute the command
- JZCommandMidiDelay cmd(mpFilter, scale / 100.0, clockDelay, repeat);
- cmd.Execute();
- SetScrollRanges();
- Refresh();
- }
-*/
+// if (!EventsSelected())
+// {
+// return;
+// }
+//
+// int scale = 50; //in percent
+// int clockDelay = 10;
+// int repeat = 6;
+//
+// jppResourceDialog dialog(this, "midiDelay");
+//
+// dialog.Attach("scale", &scale);
+// dialog.Attach("clockDelay", &clockDelay);
+// dialog.Attach("repeat", &repeat);
+//
+// if (dialog.ShowModal() == wxID_OK)
+// {
+// //execute the command
+// JZCommandMidiDelay cmd(mpFilter, scale / 100.0, clockDelay, repeat);
+// cmd.Execute();
+// SetScrollRanges();
+// Refresh();
+// }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateSequenceLengthDialog()
{
-/*
- if (!EventsSelected())
- {
- return;
- }
-
- int scale = 100; //in percent
-
- jppResourceDialog dialog(this, "sequenceLength");
-
- dialog.Attach("scale", &scale);
-
- if (dialog.ShowModal() == wxID_OK)
- {
- //execute the command
- JZCommandSequenceLength cmd(mpFilter, scale / 100.0);
- cmd.Execute();
- SetScrollRanges();
- Refresh();
- }
-*/
+// if (!EventsSelected())
+// {
+// return;
+// }
+//
+// int scale = 100; //in percent
+//
+// jppResourceDialog dialog(this, "sequenceLength");
+//
+// dialog.Attach("scale", &scale);
+//
+// if (dialog.ShowModal() == wxID_OK)
+// {
+// //execute the command
+// JZCommandSequenceLength cmd(mpFilter, scale / 100.0);
+// cmd.Execute();
+// SetScrollRanges();
+// Refresh();
+// }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-07 21:49:28
|
Revision: 900
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=900&view=rev
Author: pstieber
Date: 2011-08-07 21:49:22 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
1. Removed commented code.
2. Cleaned up the JZListen singleton in the destructor.
Modified Paths:
--------------
trunk/jazz/src/PianoWindow.cpp
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2011-08-06 22:29:04 UTC (rev 899)
+++ trunk/jazz/src/PianoWindow.cpp 2011-08-07 21:49:22 UTC (rev 900)
@@ -659,10 +659,6 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//JZListen JZPianoWindow::mListen;
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
JZPianoWindow::JZPianoWindow(
JZPianoFrame* pPianoFrame,
JZProject* pProject,
@@ -731,6 +727,7 @@
delete mpFixedFont;
delete mpDrumFont;
delete mpFrameBuffer;
+ JZListen::Destroy();
}
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 22:29:10
|
Revision: 899
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=899&view=rev
Author: pstieber
Date: 2011-08-06 22:29:04 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Creation of a timer relies on access to application traits in wx 2.9. Access to application traits
requires the setting of the global application instance. The old code had a static instance of a
JZListen class that was derived from wxTimer. This object was created before the application and
this was causing problems. I changed the JZListen class to be implemented as a singleton.
Modified Paths:
--------------
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2011-08-06 21:28:14 UTC (rev 898)
+++ trunk/jazz/src/PianoWindow.cpp 2011-08-06 22:29:04 UTC (rev 899)
@@ -52,8 +52,32 @@
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+JZListen* JZListen::mpInstance = 0;
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZListen* JZListen::Instance()
+{
+ if (!mpInstance)
+ {
+ mpInstance = new JZListen;
+ }
+ return mpInstance;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZListen::Destroy()
+{
+ delete mpInstance;
+ mpInstance = 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
JZListen::JZListen()
- : mActive(false),
+ : wxTimer(),
+ mActive(false),
mPitch(-1),
mChannel(-1),
mpTrack(0)
@@ -635,7 +659,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-JZListen JZPianoWindow::mListen;
+//JZListen JZPianoWindow::mListen;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -3042,7 +3066,7 @@
}
else
{
- mListen.KeyOn(
+ JZListen::Instance()->KeyOn(
pTrack,
pKeyOn->GetKey(),
pKeyOn->GetChannel(),
@@ -3137,7 +3161,7 @@
}
else
{
- mListen.KeyOn(
+ JZListen::Instance()->KeyOn(
pTrack,
pKeyOn->GetKey(),
pKeyOn->GetChannel(),
Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h 2011-08-06 21:28:14 UTC (rev 898)
+++ trunk/jazz/src/PianoWindow.h 2011-08-06 22:29:04 UTC (rev 899)
@@ -43,19 +43,27 @@
{
public:
- JZListen();
+ static JZListen* Instance();
+ static void Destroy();
+
void KeyOn(
- JZTrack *t,
+ JZTrack* pTrack,
int Pitch,
int Channel,
int Velocity = 64,
int MilliSeconds = 100);
- void Notify();
+ virtual void Notify();
private:
+ JZListen();
+
+ private:
+
+ static JZListen* mpInstance;
+
bool mActive;
int mPitch, mChannel;
@@ -293,7 +301,7 @@
private:
- static JZListen mListen;
+// static JZListen mListen;
JZTrack* mpTrack;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 21:28:20
|
Revision: 898
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=898&view=rev
Author: pstieber
Date: 2011-08-06 21:28:14 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Removed empty event table code.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2011-08-06 16:52:31 UTC (rev 897)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2011-08-06 21:28:14 UTC (rev 898)
@@ -78,11 +78,6 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(JZJazzPlusPlusApplication, wxApp)
-END_EVENT_TABLE()
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
JZJazzPlusPlusApplication::JZJazzPlusPlusApplication()
: wxApp(),
mpProject(0),
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2011-08-06 16:52:31 UTC (rev 897)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2011-08-06 21:28:14 UTC (rev 898)
@@ -106,8 +106,6 @@
JZTrackFrame* mpTrackFrame;
mutable wxHtmlHelpController mHelp;
-
- DECLARE_EVENT_TABLE()
};
DECLARE_APP(JZJazzPlusPlusApplication)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 16:52:37
|
Revision: 897
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=897&view=rev
Author: pstieber
Date: 2011-08-06 16:52:31 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated the 64-bit builds.
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 16:23:40 UTC (rev 896)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 16:52:31 UTC (rev 897)
@@ -124,6 +124,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -149,7 +150,7 @@
<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"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -164,7 +165,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -180,11 +181,11 @@
/>
<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="wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxexpatd.lib wxmsw29ud_core.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud.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""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -322,6 +323,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -348,7 +350,7 @@
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"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_amd64_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -365,7 +367,7 @@
DebugInformationFormat="3"
CallingConvention="2"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -381,11 +383,11 @@
/>
<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="wxmsw29u_xrc.lib wxbase29u_xml.lib wxexpat.lib wxmsw29u_core.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u.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.9.2-VC9\lib\vc_amd64_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 16:23:46
|
Revision: 896
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=896&view=rev
Author: pstieber
Date: 2011-08-06 16:23:40 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated the 64-bit build configurations.
Modified Paths:
--------------
trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2011-08-06 15:10:24 UTC (rev 895)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2011-08-06 16:23:40 UTC (rev 896)
@@ -37,10 +37,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -74,6 +76,8 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">JazzPlusPlus</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">JazzPlusPlus</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">
<Midl>
@@ -137,7 +141,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +157,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,10 +165,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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)</AdditionalDependencies>
+ <AdditionalDependencies>wxmsw29ud_xrc.lib;wxbase29ud_xml.lib;wxexpatd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;wxmsw29ud_html.lib;wxbase29ud.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -239,7 +243,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -257,7 +261,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>StdCall</CallingConvention>
<CompileAs>Default</CompileAs>
- <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -265,10 +269,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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)</AdditionalDependencies>
+ <AdditionalDependencies>wxmsw29u_xrc.lib;wxbase29u_xml.lib;wxexpat.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxmsw29u_html.lib;wxbase29u.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)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 15:10:30
|
Revision: 895
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=895&view=rev
Author: pstieber
Date: 2011-08-06 15:10:24 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated 32-bit builds to wxWidgets 2.9.2 and Unicode.
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 15:07:29 UTC (rev 894)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 15:10:24 UTC (rev 895)
@@ -25,6 +25,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -50,7 +51,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -65,7 +66,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -81,11 +82,11 @@
/>
<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="wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxexpatd.lib wxmsw29ud_core.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud.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.9.2-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -221,6 +222,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -247,7 +249,7 @@
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"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -263,7 +265,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -279,11 +281,11 @@
/>
<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="wxmsw29u_xrc.lib wxbase29u_xml.lib wxexpat.lib wxmsw29u_core.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u.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""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-06 15:07:35
|
Revision: 894
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=894&view=rev
Author: pstieber
Date: 2011-08-06 15:07:29 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Looks like command line arguments are wxString objects to convert to a C string for atoi.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2011-08-06 15:04:06 UTC (rev 893)
+++ trunk/jazz/src/Project.cpp 2011-08-06 15:07:29 UTC (rev 894)
@@ -320,7 +320,7 @@
{
if ((wxTheApp->argc > opt) && isdigit(wxTheApp->argv[opt][0]))
{
- mpConfig->Put(i + C_TrackWinXpos, atoi(wxTheApp->argv[opt]));
+ mpConfig->Put(i + C_TrackWinXpos, atoi(wxTheApp->argv[opt].c_str()));
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
