SF.net SVN: jazzplusplus: [396] trunk/jazz/src

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

Revision: 396
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=396&view=rev
Author:   pstieber
Date:     2008-04-04 22:19:53 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Commented some code that caused an unkillable process on Mandriva 2008.0 and removed some debug output.

Modified Paths:
--------------
    trunk/jazz/src/AlsaDriver.cpp
    trunk/jazz/src/AlsaPlayer.cpp
    trunk/jazz/src/AlsaThru.cpp
    trunk/jazz/src/JazzPlusPlusApplication.cpp
    trunk/jazz/src/Player.cpp
    trunk/jazz/src/Project.cpp

Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/AlsaDriver.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -135,7 +135,6 @@
 
 tAlsaAudioPlayer::~tAlsaAudioPlayer()
 {
-  cout << "Deleting ALSA audio driver start..." << endl;
   delete listener;
   delete AudioBuffer;
   if (pcm[PLAYBACK])
@@ -148,7 +147,6 @@
     snd_pcm_close(pcm[CAPTURE]);
     pcm[CAPTURE] = NULL;
   }
-  cout << "Done." << endl;
 }
 
 

Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/AlsaPlayer.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -301,7 +301,8 @@
   {
     delete thru;
   }
-  snd_seq_close(handle);
+  // The following call caused an unkillable process on Mandriva 2008.0.
+//  snd_seq_close(handle);
 }
 
 //-----------------------------------------------------------------------------
@@ -437,7 +438,6 @@
   ev.source = self;
   ev.dest = self;
   snd_seq_ev_schedule_tick(&ev, queue, 0, clock);
-  cout << "scheduling echo for " << clock << endl;
   snd_seq_ev_set_fixed(&ev);
   ev.type = SND_SEQ_EVENT_ECHO;
   ev.data.raw32.d[0] = arg;
@@ -464,7 +464,6 @@
 //-----------------------------------------------------------------------------
 void tAlsaPlayer::StartPlay(long clock, long loopClock, int cont)
 {
-  cout << "tAlsaPlayer::StartPlay" << endl;
   recd_clock = clock;
   echo_clock = clock;
   play_clock = clock;

Modified: trunk/jazz/src/AlsaThru.cpp
===================================================================
--- trunk/jazz/src/AlsaThru.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/AlsaThru.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -62,8 +62,10 @@
 
 tAlsaThru::~tAlsaThru()
 {
-  if (running)
-    Stop();
+  // Calling Stop() caused the creation of an unkillable process on Mandriva
+  // 2008.0.
+//  if (running)
+//    Stop();
 }
 
 
@@ -124,7 +126,8 @@
 // disconnect midi-thru
 void tAlsaThru::Stop()
 {
-  if (running) {
+  if (running)
+  {
     initialize();
     disconnect(source, destin);
     running = 0;

Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -47,10 +47,6 @@
 
 #endif
 
-#include <iostream>
-
-using namespace std;
-
 //*****************************************************************************
 // Description:
 //   This is the JazzPlusPlus application class definition.
@@ -108,7 +104,6 @@
 //-----------------------------------------------------------------------------
 JZJazzPlusPlusApplication::~JZJazzPlusPlusApplication()
 {
-  cout << "In the application desstructor" << endl;
 }
 
 //-----------------------------------------------------------------------------
@@ -172,7 +167,6 @@
   // Prevent reported leaks from the configuration class.
   delete wxConfigBase::Set(0);
 
-  cout << "Done in OnExit" << endl;
   return 0;
 }
 

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/Player.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -205,7 +205,9 @@
 
 JZPlayer::~JZPlayer()
 {
+  cout << "JZPlayer delete start..." << endl;
   delete PlayLoop;
+  cout << "JZPlayer delete end..." << endl;
 }
 
 

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2008-04-05 01:37:46 UTC (rev 395)
+++ trunk/jazz/src/Project.cpp	2008-04-05 05:19:53 UTC (rev 396)
@@ -170,19 +170,24 @@
     mpMidiPlayer = new tAudioPlayer(this);
     if (!mpMidiPlayer->Installed())
     {
+      cerr << "tAudioPlayer didn't install." << endl;
+
       delete mpMidiPlayer;
       mpMidiPlayer = new tSeq2Player(this);
     }
     if (!mpMidiPlayer->Installed())
     {
+      cerr << "tSeq2Player didn't install." << endl;
+
       perror("/dev/music");
-      cerr
-        << "(dev_sequencer2)Jazz will start with no play/record ability."
-        << endl;
+
+      cerr << "Jazz will start with no play/record ability." << endl;
+      delete mpMidiPlayer;
       mpMidiPlayer = new tNullPlayer(this);
     }
 #else
-    cerr << "This programm lacks OSS driver support" << endl;
+    cerr << "This programm lacks OSS driver support." << endl;
+    cerr << "Jazz will start with no play/record ability." << endl;
     mpMidiPlayer = new tNullPlayer(this);
 #endif // DEV_SEQUENCER2
   }
@@ -192,20 +197,25 @@
     mpMidiPlayer = new tAlsaAudioPlayer(this);
     if (!mpMidiPlayer->Installed())
     {
+      cerr << "tAlsaAudioPlayer didn't install." << endl;
+
       delete mpMidiPlayer;
-      cout << "creating alsa player" << endl;
       mpMidiPlayer = new tAlsaPlayer(this);
     }
     if (!mpMidiPlayer->Installed())
     {
+      cerr << "tAlsaPlayer didn't install." << endl;
+
       cerr
         << "Could not install alsa driver." << '\n'
         << "Jazz will start with no play/record ability."
         << endl;
+      delete mpMidiPlayer;
       mpMidiPlayer = new tNullPlayer(this);
     }
 #else
     cerr << "This programm lacks ALSA driver support" << endl;
+    cerr << "Jazz will start with no play/record ability." << endl;
     mpMidiPlayer = new tNullPlayer(this);
 #endif
   }
@@ -215,15 +225,19 @@
     mpMidiPlayer = new tMpuPlayer(this);
     if (!mpMidiPlayer->Installed())
     {
+      cerr << "tMpuPlayer didn't install." << endl;
+
       cerr
         << "Could not connect to midinet server at host \""
         << %midinethost << "\"\n"
         << "Jazz will start with no play/record ability."
         << endl;
+      delete mpMidiPlayer;
       mpMidiPlayer = new tNullPlayer(this);
     }
 #else
     cerr << "This programm lacks JAZZ/MPU401 driver support" << endl;
+    cerr << "Jazz will start with no play/record ability." << endl;
     mpMidiPlayer = new tNullPlayer(this);
 #endif
   }
@@ -325,7 +339,6 @@
   delete mpSynth;
   delete mpRecInfo;
   delete mpConfig;
-  cout << "Done Deleting the project." << endl;
 }
 
 //-----------------------------------------------------------------------------


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