1 files changed, 29 insertions, 2 deletions
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 7fe7987b..e219c031 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -1,10 +1,13 @@
 #include "aosfxplayer.h"
 #include "file_functions.h"
 
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
 {
   m_parent = parent;
   ao_app = p_ao_app;
+  sfx_loop_timer = new QTimer(this);
+  sfx_loop_timer->setSingleShot(true);
+  connect(sfx_loop_timer, SIGNAL(timeout()), this, SLOT(restart_loop()));
 }
 
 void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
@@ -28,7 +31,7 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
     f_path = misc_path;
   else
     f_path = sound_path;
-
+  BASS_ChannelStop(m_stream);
   m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
 
   set_volume(m_volume);
@@ -36,11 +39,35 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
   if (ao_app->get_audio_output_device() != "default")
     BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
   BASS_ChannelPlay(m_stream, false);
+  sfx_loop_timer->stop();
+  QWORD len=BASS_ChannelGetLength(m_stream, BASS_POS_BYTE); // the length in bytes
+  double time=BASS_ChannelBytes2Seconds(m_stream, len); // the length in seconds
+  if(time > 0 && looping_sfx && ao_app->get_looping_sfx())
+  {
+    sfx_loop_timer->start(time*1000);
+  }
+}
+
+void AOSfxPlayer::setLooping(bool is_looping)
+{
+    this->looping_sfx = is_looping;
 }
 
 void AOSfxPlayer::stop()
 {
   BASS_ChannelStop(m_stream);
+  sfx_loop_timer->stop();
+}
+
+void AOSfxPlayer::restart_loop()
+{
+    if(ao_app->get_looping_sfx() && looping_sfx)
+    {
+        QWORD len=BASS_ChannelGetLength(m_stream, BASS_POS_BYTE); // the length in bytes
+        double time=BASS_ChannelBytes2Seconds(m_stream, len); // the length in seconds
+        sfx_loop_timer->start(time*1000);
+        BASS_ChannelPlay(m_stream, true);
+    }
 }
 
 void AOSfxPlayer::set_volume(int p_value)