[Amis-vcs] SF.net SVN: amis: [2380] branches/amis3/AmisGuiMFC2/src/gui

[<dan...@us...>]

Revision: 2380
          http://amis.svn.sourceforge.net/amis/?rev=2380&view=rev
Author:   daniel_weck
Date:     2008-03-02 19:41:28 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
a few minor fixes, removed the hard-coded self-voicing flag

Modified Paths:
--------------
    branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
    branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp

Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-03-03 03:31:51 UTC (rev 2379)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-03-03 03:41:28 UTC (rev 2380)
@@ -292,9 +292,6 @@
 
 	if (did_it_work == amis::OK)
 	{
-		
-	amis::Preferences::Instance()->setIsSelfVoicing(false);
-
 		//test print to an output file
 		//p_new_data_tree->testPrint("c:\\devel\\amis\\Langpacks\\sandbox\\dataout.txt");
 		

Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp	2008-03-03 03:31:51 UTC (rev 2379)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp	2008-03-03 03:41:28 UTC (rev 2380)
@@ -31,14 +31,14 @@
 void AudioSequencePlayer::TTSAudioEndNotify() {
 				
 #ifdef CCS_ACTIVE
-		EnterCriticalSection(&m_csSequence);
+		//EnterCriticalSection(&m_csSequence);
 #endif
 	m_wakeUpOriginator = 2; // TTS END
 	TRACE(L"\n ---- m_hEventWakeup TTS end\n");
 	SetEvent(m_hEventWakeup);
 
 #ifdef CCS_ACTIVE
-		LeaveCriticalSection(&m_csSequence);
+		//LeaveCriticalSection(&m_csSequence);
 #endif
 
 	/*
@@ -56,14 +56,14 @@
 void AudioSequencePlayer::ClipAudioEndNotify() {
 				
 #ifdef CCS_ACTIVE
-		EnterCriticalSection(&m_csSequence);
+		//EnterCriticalSection(&m_csSequence);
 #endif
 	m_wakeUpOriginator = 3; // AUDIO CLIP END
 	TRACE(L"\n ---- m_hEventWakeup AUDIO end\n");
 	SetEvent(m_hEventWakeup);
 
 #ifdef CCS_ACTIVE
-		LeaveCriticalSection(&m_csSequence);
+		//LeaveCriticalSection(&m_csSequence);
 #endif
 	/*
 	if (m_wakeUpAction != 0) {


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