X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Sound.cpp;h=ba1a0c95b9f942aeb19e5c0e8c98a065bc4fbb0a;hb=700c6a4c98319bc09eeb5c0905a5dafac8aa61cc;hp=45305b5431abff1fce946f5bf4d485a2117ace51;hpb=ee9715392a67c92a3c199a47e23743f80a0ba7b8;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp index 45305b5..ba1a0c9 100644 --- a/source/contacteditor/frmContactEditor-Sound.cpp +++ b/source/contacteditor/frmContactEditor-Sound.cpp @@ -26,12 +26,9 @@ void frmContactEditor::AddSound( wxCommandEvent& event ) { // Bring up a form to add sound. - - int intResult = 0; - + frmContactEditorSound *frameCESound = new frmContactEditorSound ( this ); frameCESound->SetEditorMode(FALSE); - intResult = GetLastInt(&ContactEditorData.SoundsList); frameCESound->SetupPointers(&ContactEditorData.SoundsList, &ContactEditorData.SoundsListAltID, &ContactEditorData.SoundsListPID, @@ -122,16 +119,9 @@ void frmContactEditor::PlaySoundDetach() } btnStop->Enable(); - - //AudioStreamPlayback.setbuffer(AudioBuffer); + AudioStreamPlayback.play(); - /*timespec n1, n2; - - n1.tv_sec = 0; - n1.tv_nsec = 100000000L;*/ - - //while (TimeA != TimeB){ while (AudioStreamPlayback.getStatus() == sf::SoundSource::Playing){ // We poll this every 100ms in order to conserve CPU usage. @@ -148,24 +138,6 @@ void frmContactEditor::PlaySound( wxCommandEvent& event ) { // Play the sound. - - //sf::Music *AudioPlayback = new sf::Music; - //AudioStream *AudioStreamPlayback = new AudioStream; - //sf::SoundBuffer *AudioBuffer = new sf::SoundBuffer; - - //sf::Sound *AudioPlayback = new sf::Sound; - - //delete(AudioPlayback); - - //delete(AudioPlayback); - //delete(AudioStreamPlayback); - //delete(AudioBuffer); - - //AudioPlayback = NULL; - //AudioStreamPlayback = NULL; - //AudioBuffer = NULL; - - //return; long longSelected = -1; int intSelectedData = 0;