Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.

1 files changed, 33 insertions, 53 deletions

diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 4684acdb..710d7a8a 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -1,8 +1,8 @@
 #include "aosfxplayer.h"
 #include "file_functions.h"
 
-#if defined(BASSAUDIO) // Using bass.dll for sfx
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
+#if defined(BASSAUDIO) //Using bass.dll for sfx
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
   ao_app = p_ao_app;
@@ -11,7 +11,7 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
 void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
 {
   BASS_ChannelStop(m_stream);
-
+  
   QString misc_path = "";
   QString char_path = "";
   QString sound_path = ao_app->get_sounds_path(p_sfx);
@@ -24,49 +24,34 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
   QString f_path;
 
   if (file_exists(char_path))
-    f_path = char_path;
+      f_path = char_path;
   else if (file_exists(misc_path))
     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_internal(m_volume);
+  m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
+
+  set_volume(m_volume);
 
   if (ao_app->get_audio_output_device() != "default")
     BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
   BASS_ChannelPlay(m_stream, false);
-  if (looping_sfx && ao_app->get_looping_sfx()) {
-    BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP);
-  }
-  else {
-    BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP);
-  }
-}
-
-void AOSfxPlayer::setLooping(bool is_looping)
-{
-  this->looping_sfx = is_looping;
 }
 
-void AOSfxPlayer::stop() { BASS_ChannelStop(m_stream); }
-
-void AOSfxPlayer::set_volume(qreal p_value)
+void AOSfxPlayer::stop()
 {
-  m_volume = p_value / 100;
-  set_volume_internal(m_volume);
+  BASS_ChannelStop(m_stream);
 }
 
-void AOSfxPlayer::set_volume_internal(qreal p_value)
+void AOSfxPlayer::set_volume(int p_value)
 {
-  float volume = p_value;
+  m_volume = p_value;
+  float volume = p_value / 100.0f;
   BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
 }
-#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
+#elif defined(QTAUDIO) //Using Qt's QSoundEffect class
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
   ao_app = p_ao_app;
@@ -88,56 +73,51 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
   QString f_path;
 
   if (file_exists(char_path))
-    f_path = char_path;
+      f_path = char_path;
   else if (file_exists(misc_path))
     f_path = misc_path;
   else
     f_path = sound_path;
 
-  if (file_exists(f_path)) // if its missing, it will glitch out
+  if (file_exists(f_path)) //if its missing, it will glitch out
   {
-    m_sfx.setSource(QUrl::fromLocalFile(f_path));
+  m_sfx.setSource(QUrl::fromLocalFile(f_path));
 
-    set_volume_internal(m_volume);
+  set_volume(m_volume);
 
-    m_sfx.play();
+  m_sfx.play();
   }
 }
 
-void AOSfxPlayer::setLooping(bool is_looping)
+void AOSfxPlayer::stop()
 {
-  this->looping_sfx = is_looping;
-}
-
-void AOSfxPlayer::stop() { m_sfx.stop(); }
-
-void AOSfxPlayer::set_volume(qreal p_value)
-{
-  m_volume = p_value / 100;
-  set_volume_internal(m_volume);
+  m_sfx.stop();
 }
 
-void AOSfxPlayer::set_volume_internal(qreal p_value)
+void AOSfxPlayer::set_volume(int p_value)
 {
+  m_volume = p_value;
   m_sfx.setVolume(m_volume);
 }
 #else
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
   ao_app = p_ao_app;
 }
 
-void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) {}
-
-void AOSfxPlayer::setLooping(bool is_looping)
+void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
 {
-  this->looping_sfx = is_looping;
+
 }
 
-void AOSfxPlayer::stop() {}
+void AOSfxPlayer::stop()
+{
 
-void AOSfxPlayer::set_volume(qreal p_value) {}
+}
 
-void AOSfxPlayer::set_volume_internal(qreal p_value) {}
+void AOSfxPlayer::set_volume(int p_value)
+{
+
+}
 #endif