jazzplusplus-updates

SF.net SVN: jazzplusplus: [362] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 362
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=362&view=rev
Author:   pstieber
Date:     2008-03-30 05:00:14 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
1. Fixed a bug that involved the use of "Could not find configuration file." in
a message box when it was actually found.
2. Changed the format of a debug message.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-03-30 11:58:15 UTC (rev 361)
+++ trunk/jazz/src/Project.cpp	2008-03-30 12:00:14 UTC (rev 362)
@@ -384,21 +384,18 @@
     Is.open(ConfFileNameAndPath.c_str());
     if (!Is)
     {
-      Is.close();
-      Is.clear();
-    }
-    else
-    {
       wxMessageBox(
         "Could not find configuration file.",
         "Warning",
         wxOK);
     }
+    Is.close();
+    Is.clear();
   }
 
   cout
     << "JZProject::ReadConfiguration() ConfFileNameAndPath:" << '\n'
-    << '"' << ConfFileNameAndPath << '"'
+    << "  \"" << ConfFileNameAndPath << '"'
     << endl;
 
   if (!ConfFileNameAndPath.IsEmpty())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus: [364] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 364
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=364&view=rev
Author:   pstieber
Date:     2008-03-30 05:21:10 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
1. Fixed some comments.
2. Made cosmetic changes.
3. Added code to set the startup song in OpenSong.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-03-30 12:07:02 UTC (rev 363)
+++ trunk/jazz/src/Project.cpp	2008-03-30 12:21:10 UTC (rev 364)
@@ -295,8 +295,8 @@
   }
 
 
-  // Attempt to load the song given on commandline or load "jazz.mid".
-  cout << "load song" << endl;
+  // Attempt to load the song given on command line or the file specified in
+  // the configuration file.
   opt = GetOptionIndex( "-f" ) + 1;
   if (opt && (wxTheApp->argc > opt))
   {
@@ -306,7 +306,7 @@
   {
     gpStartUpSong = mpConfig->StrValue(C_StartUpSong);
   }
-  FILE *fd = fopen(gpStartUpSong.c_str(), "r");
+  FILE* fd = fopen(gpStartUpSong.c_str(), "r");
   if (fd)
   {
     fclose(fd);
@@ -317,11 +317,6 @@
 //      lasts = gpStartUpSong;
 //    }
   }
-
-
-
-
-
 }
 
 //-----------------------------------------------------------------------------
@@ -500,16 +495,16 @@
   mPatternFileName = PatternFileName;
 }
 
-/**
- *
- *  Open a midi file.  Pass it a wxString containing the path to the file.
- *
- */
+//-----------------------------------------------------------------------------
+// Description:
+//   Open a midi file.  Pass it a wxString containing the path to the file.
+//-----------------------------------------------------------------------------
 void JZProject::OpenSong(const wxString& SongFileName)
 {
   tStdRead io;
   Clear();
   Read(io, SongFileName);
+  mpConfig->Put(C_StartUpSong, SongFileName.c_str());
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus: [382] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 382
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=382&view=rev
Author:   pstieber
Date:     2008-04-01 17:31:44 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
Changed the way file existence is checked, moved debug output, and removed and extra can't finc conf file message box.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-04-01 21:21:06 UTC (rev 381)
+++ trunk/jazz/src/Project.cpp	2008-04-02 00:31:44 UTC (rev 382)
@@ -23,6 +23,7 @@
 #include "WxWidgets.h"
 #include <wx/config.h>
 #include <wx/filename.h>
+#include <wx/file.h>
 
 #include "Project.h"
 #include "RecordingInfo.h"
@@ -360,39 +361,28 @@
   wxString ConfFileNameAndPath = ConfFilePath + mConfFileName;
 
   // Test for the existence of the Jazz++ configuration file.
-  ifstream Is;
-  Is.open(ConfFileNameAndPath.c_str());
-  if (!Is)
+  if (!::wxFileExists(ConfFileNameAndPath))
   {
-    // Close and clear the stream.
-    Is.close();
-    Is.clear();
-
     // Return a valid path to the data.
     FindAndRegisterConfFilePath(ConfFilePath);
     ConfFileNameAndPath = ConfFilePath + mConfFileName;
 
     // Try one more time.
-    Is.open(ConfFileNameAndPath.c_str());
-    if (!Is)
+    if (!::wxFileExists(ConfFileNameAndPath))
     {
-      wxMessageBox(
-        "Could not find configuration file.",
-        "Warning",
-        wxOK);
+      ConfFileNameAndPath.clear();
     }
-    Is.close();
-    Is.clear();
   }
 
-  cout
-    << "JZProject::ReadConfiguration() ConfFileNameAndPath:" << '\n'
-    << "  \"" << ConfFileNameAndPath << '"'
-    << endl;
-
   if (!ConfFileNameAndPath.IsEmpty())
   {
+    cout
+      << "JZProject::ReadConfiguration() ConfFileNameAndPath:" << '\n'
+      << "  \"" << ConfFileNameAndPath << '"'
+      << endl;
+
     mpConfig->LoadConfig(ConfFileNameAndPath);
+
     DEBUG(
       if (BankTable != (tDoubleCommand *) NULL)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus: [391] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 391
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=391&view=rev
Author:   pstieber
Date:     2008-04-02 22:06:06 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
Added missing terminating quote.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-04-03 04:42:40 UTC (rev 390)
+++ trunk/jazz/src/Project.cpp	2008-04-03 05:06:06 UTC (rev 391)
@@ -216,7 +216,7 @@
     if (!mpMidiPlayer->Installed())
     {
       cerr
-        << "Could not connect to midinet server at host \"
+        << "Could not connect to midinet server at host \""
         << %midinethost << "\"\n"
         << "Jazz will start with no play/record ability."
         << endl;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus: [486] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 486
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=486&view=rev
Author:   pstieber
Date:     2008-05-04 20:52:12 -0700 (Sun, 04 May 2008)

Log Message:
-----------
Wrapped the inclusion of the ALSA specific audio driver with a WXGTK check to exclude it from the Mac build.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-05-05 03:50:58 UTC (rev 485)
+++ trunk/jazz/src/Project.cpp	2008-05-05 03:52:12 UTC (rev 486)
@@ -38,7 +38,7 @@
 #ifdef __WXMSW__
 #include "WindowsPlayer.h"
 #include "WindowsAudioInterface.h"
-#else
+#elif __WXGTK__
 #include "AudioDriver.h"
 #endif
 #ifdef DEV_ALSA


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus: [570] trunk/jazz/src/Project.cpp

[<pst...@us...>]

Revision: 570
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=570&view=rev
Author:   pstieber
Date:     2008-05-26 17:41:21 -0700 (Mon, 26 May 2008)

Log Message:
-----------
Added some code for portmidi access on a Mac.

Modified Paths:
--------------
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-05-26 23:40:02 UTC (rev 569)
+++ trunk/jazz/src/Project.cpp	2008-05-27 00:41:21 UTC (rev 570)
@@ -40,7 +40,10 @@
 #include "WindowsAudioInterface.h"
 #elif __WXGTK__
 #include "AudioDriver.h"
+#elif __WXMAC__
+#include "PortMidiPlayer.h"
 #endif
+
 #ifdef DEV_ALSA
 #include "AlsaPlayer.h"
 #include "AlsaDriver.h"
@@ -160,7 +163,7 @@
   //--------------
   // Linux drivers
   //--------------
-#ifndef __WXMSW__
+#ifdef __WXGTK__
   if (gpConfig->GetValue(C_MidiDriver) == eMidiDriverOss)
   {
 #ifdef DEV_SEQUENCER2
@@ -245,7 +248,7 @@
       << "Jazz will start with no play/record ability"
       << endl;
   }
-#endif // !defined(__WXMSW__)
+#endif // defined(__WXGTK__)
 
 
 #ifdef __WXMSW__
@@ -280,6 +283,17 @@
   }
 #endif // __WXMSW__
 
+#ifdef __WXMAC__
+  //------------------
+  // Macintosh Drivers
+  //------------------
+  mpMidiPlayer = new JZPortMidiPlayer(this);
+  if (!mpMidiPlayer->Installed())
+  {
+    cout << "Jazz++ will start with no play/record ability." << endl;
+  }
+#endif // __WXMAC__
+
   if (!mpMidiPlayer)
   {
     mpMidiPlayer = new tNullPlayer(this);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.