[Lmuse-cvs-traffic] muse/muse/driver dummyaudio.cpp, 1.3.2.13, 1.3.2.14 jack.cpp, 1.30.2.15, 1.30.2.16

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse/driver
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13866/muse/driver

Modified Files:
      Tag: REL07
	dummyaudio.cpp jack.cpp 
Log Message:
See ChangeLog

Index: jack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/jack.cpp,v
retrieving revision 1.30.2.15
retrieving revision 1.30.2.16
diff -C2 -d -r1.30.2.15 -r1.30.2.16
*** jack.cpp	5 Jul 2009 21:00:21 -0000	1.30.2.15
--- jack.cpp	4 Dec 2009 02:21:49 -0000	1.30.2.16
***************
*** 51,55 ****
        {
        if (audioDevice == NULL) {
!             printf("Panic! no audioDevice!\n");
              return false;
              }
--- 51,55 ----
        {
        if (audioDevice == NULL) {
!             printf("Muse:checkAudioDevice: no audioDevice\n");
              return false;
              }
***************
*** 613,616 ****
--- 613,620 ----
        if (jackAudio)
              delete jackAudio;
+             
+       // Added by Tim. p3.3.14
+       audioDevice = NULL;      
+       
        }
  

Index: dummyaudio.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/dummyaudio.cpp,v
retrieving revision 1.3.2.13
retrieving revision 1.3.2.14
diff -C2 -d -r1.3.2.13 -r1.3.2.14
*** dummyaudio.cpp	18 Oct 2009 06:13:00 -0000	1.3.2.13
--- dummyaudio.cpp	4 Dec 2009 02:21:49 -0000	1.3.2.14
***************
*** 144,148 ****
        };
  
! DummyAudioDevice* dummyAudio;
  
  DummyAudioDevice::DummyAudioDevice() 
--- 144,148 ----
        };
  
! DummyAudioDevice* dummyAudio = 0;
  
  DummyAudioDevice::DummyAudioDevice() 
***************
*** 155,160 ****
        }
  
  
! 
  
  //---------------------------------------------------------
--- 155,169 ----
        }
  
+ //---------------------------------------------------------
+ //   exitDummyAudio
+ //---------------------------------------------------------
  
! void exitDummyAudio()
! {
!       if(dummyAudio)
!         delete dummyAudio;
!       dummyAudio = NULL;      
!       audioDevice = NULL;      
! }
  
  //---------------------------------------------------------