X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Sound.cpp;h=7d9fcde70028263eb45902674e8f4d4251a1d3f5;hp=ba1a0c95b9f942aeb19e5c0e8c98a065bc4fbb0a;hb=202a753a3225784909977a63022e0f64672e97e6;hpb=46fd8dea9f658ab45dd7fbea0e04987221acf17b

diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp
index ba1a0c9..7d9fcde 100644
--- a/source/contacteditor/frmContactEditor-Sound.cpp
+++ b/source/contacteditor/frmContactEditor-Sound.cpp
@@ -17,10 +17,6 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmContactEditor.h"
-#include "frmContactEditorSound.h"
-#include "../common/base64.h"
-#include <SFML/Audio.hpp>
-#include <thread>
 
 void frmContactEditor::AddSound( wxCommandEvent& event )
 {
@@ -107,7 +103,7 @@ void frmContactEditor::PlaySoundDetach()
     
 	// Play the sound and detach.
 	
-	if (!AudioStreamPlayback.openFromMemory(base64dec.c_str(), base64declen)){
+	if (!AudioStreamPlaybackPointer->openFromMemory(base64dec.c_str(), base64declen)){
         
 		// Can't load file. We must flee...
 		// Also show an error message too.
@@ -120,17 +116,18 @@ void frmContactEditor::PlaySoundDetach()
     
 	btnStop->Enable();
 
-	AudioStreamPlayback.play();
+	AudioStreamPlaybackPointer->play();
     
-	while (AudioStreamPlayback.getStatus() == sf::SoundSource::Playing){
+	while (AudioStreamPlaybackPointer->getStatus() == sf::SoundSource::Playing){
         
 		// We poll this every 100ms in order to conserve CPU usage.
         
-		SleepFor(100000000);
+		SleepFor(10000000);
         
 	}
-    
+	
 	btnStop->Disable();
+	btnPlay->Enable();
     
 }
 
@@ -142,11 +139,17 @@ void frmContactEditor::PlaySound( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
+	if (AudioStreamPlaybackPointer == nullptr){
+		
+		AudioStreamPlaybackPointer = new AudioStream;
+		
+	}
+	
 	// Check if sound is still being played and if it is, stop it.
     
-	if (AudioStreamPlayback.getStatus() == sf::SoundSource::Playing){
+	if (AudioStreamPlaybackPointer->getStatus() == sf::SoundSource::Playing){
         
-		AudioStreamPlayback.stop();
+		AudioStreamPlaybackPointer->stop();
         
 	}
     
@@ -155,7 +158,9 @@ void frmContactEditor::PlaySound( wxCommandEvent& event )
 		&intSelectedData)){
 		return;
 	}
-    
+
+	btnPlay->Disable();
+	
 	std::map<int, std::string>::iterator initier;
     
 	initier = ContactEditorData.SoundsList.find(intSelectedData);
@@ -174,14 +179,15 @@ void frmContactEditor::StopSound( wxCommandEvent& event )
 {
 	
 	// Stop the sound.
-    
-	if (AudioStreamPlayback.getStatus() == sf::SoundSource::Playing){
-        
-		AudioStreamPlayback.stop();
+	
+	if (AudioStreamPlaybackPointer != nullptr && AudioStreamPlaybackPointer->getStatus() == sf::SoundSource::Playing){
         
+		AudioStreamPlaybackPointer->stop();
+		
 	}
     
 	btnStop->Disable();
+	btnPlay->Enable();
 
 	return;