|
From: <pst...@us...> - 2008-10-08 03:23:32
|
Revision: 611
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=611&view=rev
Author: pstieber
Date: 2008-10-08 03:23:28 +0000 (Wed, 08 Oct 2008)
Log Message:
-----------
Changed arguments to match naming convention.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2008-09-24 20:48:30 UTC (rev 610)
+++ trunk/jazz/src/Project.cpp 2008-10-08 03:23:28 UTC (rev 611)
@@ -556,30 +556,30 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZProject::Mute(bool newmute)
+void JZProject::Mute(bool Mute)
{
- mMuted = newmute;
+ mMuted = Mute;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZProject::SetLoop(bool newloop)
+void JZProject::SetLoop(bool Loop)
{
- mLoop = newloop;
+ mLoop = Loop;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZProject::SetRecord(bool newrecord)
+void JZProject::SetRecord(bool Record)
{
- mRecord = newrecord;
+ mRecord = Record;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZProject::SetLoopClock(int newclock)
+void JZProject::SetLoopClock(int Clock)
{
- mStopTime = newclock;
+ mStopTime = Clock;
}
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-01-20 03:37:34
|
Revision: 689
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=689&view=rev
Author: pstieber
Date: 2009-01-20 03:37:24 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Added the base class to the initializer list.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2009-01-20 00:46:00 UTC (rev 688)
+++ trunk/jazz/src/Project.cpp 2009-01-20 03:37:24 UTC (rev 689)
@@ -68,7 +68,8 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZProject::JZProject()
- : mpConfig(0),
+ : JZSong(),
+ mpConfig(0),
mpMidiPlayer(0),
mpSynth(0),
mpRecInfo(0),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 02:03:42
|
Revision: 879
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=879&view=rev
Author: pstieber
Date: 2011-08-05 02:03:36 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated some string code.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2011-08-05 01:44:29 UTC (rev 878)
+++ trunk/jazz/src/Project.cpp 2011-08-05 02:03:36 UTC (rev 879)
@@ -503,8 +503,8 @@
{
JZStandardRead Io;
Clear();
- Read(Io, SongFileName);
- mpConfig->Put(C_StartUpSong, SongFileName.c_str());
+ Read(Io, SongFileName.c_str());
+ mpConfig->Put(C_StartUpSong, SongFileName);
}
//-----------------------------------------------------------------------------
@@ -519,8 +519,8 @@
void JZProject::ExportMidiFile(const wxString& MidiFileName)
{
JZStandardWrite Io;
- Write(Io, MidiFileName);
- mpConfig->Put(C_StartUpSong, MidiFileName.c_str());
+ Write(Io, MidiFileName.c_str());
+ mpConfig->Put(C_StartUpSong, MidiFileName);
}
//-----------------------------------------------------------------------------
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.
|
|
From: <pst...@us...> - 2013-01-02 18:21:33
|
Revision: 933
http://sourceforge.net/p/jazzplusplus/code/933
Author: pstieber
Date: 2013-01-02 18:21:30 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Explicitly converted C strings to wxString values.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-01-02 18:19:09 UTC (rev 932)
+++ trunk/jazz/src/Project.cpp 2013-01-02 18:21:30 UTC (rev 933)
@@ -432,9 +432,9 @@
wxFileDialog OpenDialog(
0,
DialogTitle,
- "",
+ wxString(""),
mConfFileName,
- "*.cfg",
+ wxString("*.cfg"),
wxFD_OPEN);
if (OpenDialog.ShowModal() == wxID_OK)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 00:53:20
|
Revision: 944
http://sourceforge.net/p/jazzplusplus/code/944
Author: pstieber
Date: 2013-01-07 00:53:17 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Updated code to find jazz.cfg.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-01-06 22:53:47 UTC (rev 943)
+++ trunk/jazz/src/Project.cpp 2013-01-07 00:53:17 UTC (rev 944)
@@ -365,10 +365,24 @@
//-----------------------------------------------------------------------------
void JZProject::ReadConfiguration()
{
- wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
+ wxConfigBase* pConfig = wxConfigBase::Get();
+ wxString ConfigurationFilePathGuess =
+ wxStandardPaths::Get().GetUserDataDir();
+
+ // Attempt to obtain the path to the help file from configuration data.
+ wxString ConfigurationFilePath;
+ if (pConfig)
+ {
+ pConfig->Read(
+ "/Paths/Conf",
+ &ConfigurationFilePath,
+ ConfigurationFilePathGuess);
+ }
+
+ // Construct a full file name.
wxString JazzCfgFile =
- ConfigDir +
+ ConfigurationFilePath +
wxFileName::GetPathSeparator() +
mConfFileName;
@@ -377,10 +391,10 @@
if (!::wxFileExists(JazzCfgFile))
{
// Return a valid path to the data.
- wxString ConfFilePath;
- if (FindAndRegisterConfFilePath(ConfFilePath))
+ ConfigurationFilePath.clear();
+ if (FindAndRegisterConfFilePath(ConfigurationFilePath))
{
- JazzCfgFile = ConfFilePath + mConfFileName;
+ JazzCfgFile = ConfigurationFilePath + mConfFileName;
// Try one more time.
if (!::wxFileExists(JazzCfgFile))
@@ -400,11 +414,6 @@
if (ConfigurationFileFound)
{
- cout
- << "JZProject::ReadConfiguration() JazzCfgFile:" << '\n'
- << " \"" << JazzCfgFile << '"'
- << endl;
-
mpConfig->LoadConfig(JazzCfgFile);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 05:32:59
|
Revision: 949
http://sourceforge.net/p/jazzplusplus/code/949
Author: pstieber
Date: 2013-01-07 05:32:57 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Fixed configuration file path handling.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-01-07 05:31:29 UTC (rev 948)
+++ trunk/jazz/src/Project.cpp 2013-01-07 05:32:57 UTC (rev 949)
@@ -394,7 +394,10 @@
ConfigurationFilePath.clear();
if (FindAndRegisterConfFilePath(ConfigurationFilePath))
{
- JazzCfgFile = ConfigurationFilePath + mConfFileName;
+ JazzCfgFile =
+ ConfigurationFilePath +
+ wxFileName::GetPathSeparator() +
+ mConfFileName;
// Try one more time.
if (!::wxFileExists(JazzCfgFile))
@@ -452,7 +455,6 @@
// Generate a c-style string that contains a path to the help file.
wxString TempConfFilePath;
TempConfFilePath = ::wxPathOnly(OpenDialog.GetPath());
- TempConfFilePath += ::wxFileName::GetPathSeparator();
wxConfigBase* pConfig = wxConfigBase::Get();
if (pConfig)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-10-10 18:56:09
|
Revision: 1031
http://sourceforge.net/p/jazzplusplus/code/1031
Author: pstieber
Date: 2013-10-10 18:56:06 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
Fixed mac code.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-10-09 19:56:35 UTC (rev 1030)
+++ trunk/jazz/src/Project.cpp 2013-10-10 18:56:06 UTC (rev 1031)
@@ -292,15 +292,18 @@
//------------------
// Macintosh Drivers
//------------------
- mpMidiPlayer = new JZPortMidiPlayer(this);
- mpMidiPlayer.DeviceSelectionDialog();
+ JZPortMidiPlayer* pPortMidiPlayer = new JZPortMidiPlayer(this);
+ pPortMidiPlayer->DeviceSelectionDialog();
- if (!mpMidiPlayer->IsInstalled())
+ if (!pPortMidiPlayer->IsInstalled())
{
- delete mpMidiPlayer;
- mpMidiPlayer = 0;
+ delete pPortMidiPlayer;
cout << "Jazz++ will start with no play/record ability." << endl;
}
+ else
+ {
+ mpMidiPlayer = pPortMidiPlayer;
+ }
#endif // __WXMAC__
if (!mpMidiPlayer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|