Update Bass.dll headers to newer version

Remove a bunch of comments
Add lqapng and lqwebp to try and get apng and webp support to fuckin load already

4 files changed, 17 insertions, 23 deletions

diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index b7476190..36b87d29 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -15,6 +15,8 @@ HEADERS += $$files($$PWD/include/*.h)
 
 
 LIBS += -L$$PWD/lib
+LIBS += -lqapng
+LIBS += -lqwebp
 
 DEFINES += DISCORD
 
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 8e0d239a..9ce74852 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -44,8 +44,6 @@ private:
   // Channel 2 = extra
   // Channel 3 = extra
   HSTREAM m_stream_list[4];
-
-//  HSYNC loop_sync;
 };
 #elif defined(QTAUDIO)
 class AOMusicPlayer
diff --git a/include/bass.h b/include/bass.h
index 1c50903c..388d4068 100644
--- a/include/bass.h
+++ b/include/bass.h
@@ -1,6 +1,6 @@
 /*
 	BASS 2.4 C/C++ header file
-	Copyright (c) 1999-2018 Un4seen Developments Ltd.
+	Copyright (c) 1999-2019 Un4seen Developments Ltd.
 
 	See the BASS.CHM file for more detailed documentation
 */
@@ -117,6 +117,7 @@ typedef DWORD HPLUGIN;		// Plugin handle
 #define BASS_CONFIG_VERIFY			23
 #define BASS_CONFIG_UPDATETHREADS	24
 #define BASS_CONFIG_DEV_BUFFER		27
+#define BASS_CONFIG_REC_LOOPBACK	28

 #define BASS_CONFIG_VISTA_TRUEPOS	30

 #define BASS_CONFIG_IOS_MIXAUDIO	34

 #define BASS_CONFIG_DEV_DEFAULT		36

@@ -141,11 +142,14 @@ typedef DWORD HPLUGIN;		// Plugin handle
 #define BASS_CONFIG_AM_DISABLE		58

 #define BASS_CONFIG_NET_PLAYLIST_DEPTH	59
 #define BASS_CONFIG_NET_PREBUF_WAIT	60
+#define BASS_CONFIG_WASAPI_PERSIST	65

+#define BASS_CONFIG_REC_WASAPI		66

 
 // BASS_SetConfigPtr options
 #define BASS_CONFIG_NET_AGENT		16
 #define BASS_CONFIG_NET_PROXY		17
 #define BASS_CONFIG_IOS_NOTIFY		46

+#define BASS_CONFIG_LIBSSL			64

 
 // BASS_Init flags
 #define BASS_DEVICE_8BITS		1		// 8 bit
@@ -507,6 +511,7 @@ RETURN : Number of bytes written. Set the BASS_STREAMPROC_END flag to end the st
 #define STREAMPROC_DUMMY		(STREAMPROC*)0		// "dummy" stream
 #define STREAMPROC_PUSH			(STREAMPROC*)-1		// push stream
 #define STREAMPROC_DEVICE		(STREAMPROC*)-2		// device mix stream
+#define STREAMPROC_DEVICE_3D	(STREAMPROC*)-3		// device 3D mix stream
 
 // BASS_StreamCreateFileUser file systems
 #define STREAMFILE_NOBUFFER		0
@@ -561,6 +566,8 @@ user   : The 'user' parameter value given when calling BASS_StreamCreateURL */
 #define BASS_SYNC_MUSICINST		1
 #define BASS_SYNC_MUSICFX		3
 #define BASS_SYNC_OGG_CHANGE	12
+#define BASS_SYNC_DEV_FAIL		14
+#define BASS_SYNC_DEV_FORMAT	15
 #define BASS_SYNC_MIXTIME		0x40000000	// flag: sync at mixtime, else at playtime
 #define BASS_SYNC_ONETIME		0x80000000	// flag: sync only once, else continuously
 
@@ -593,10 +600,11 @@ user   : The 'user' parameter value given when calling BASS_RecordStart
 RETURN : TRUE = continue recording, FALSE = stop */
 
 // BASS_ChannelIsActive return values
-#define BASS_ACTIVE_STOPPED	0
-#define BASS_ACTIVE_PLAYING	1
-#define BASS_ACTIVE_STALLED	2
-#define BASS_ACTIVE_PAUSED	3
+#define BASS_ACTIVE_STOPPED			0
+#define BASS_ACTIVE_PLAYING			1
+#define BASS_ACTIVE_STALLED			2
+#define BASS_ACTIVE_PAUSED			3
+#define BASS_ACTIVE_PAUSED_DEVICE	4
 
 // Channel attributes
 #define BASS_ATTRIB_FREQ			1
@@ -641,6 +649,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
 #define BASS_DATA_FFT_NOWINDOW	0x20	// FFT flag: no Hanning window
 #define BASS_DATA_FFT_REMOVEDC	0x40	// FFT flag: pre-remove DC bias
 #define BASS_DATA_FFT_COMPLEX	0x80	// FFT flag: return complex data

+#define BASS_DATA_FFT_NYQUIST	0x100	// FFT flag: return extra Nyquist value

 
 // BASS_ChannelGetLevelEx flags
 #define BASS_LEVEL_MONO		1

@@ -1006,6 +1015,7 @@ float BASSDEF(BASS_GetCPU)();
 BOOL BASSDEF(BASS_Start)();
 BOOL BASSDEF(BASS_Stop)();
 BOOL BASSDEF(BASS_Pause)();
+BOOL BASSDEF(BASS_IsStarted)();
 BOOL BASSDEF(BASS_SetVolume)(float volume);
 float BASSDEF(BASS_GetVolume)();
 
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index e0b19483..58104280 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2601,22 +2601,6 @@ void Courtroom::chat_tick()
     }
     ui_vp_message->ensureCursorVisible();
 
-  //  //Grab the currently displayed chars
-  //  f_rest = f_message.left(tick_pos);
-  //  f_rest.replace("\\n", "\n");
-
-  //  QFontMetrics fm = fontMetrics();
-  //  QRect bounding_rect = fm.boundingRect(QRect(0,0,ui_vp_message->width(),ui_vp_message->height()), Qt::TextWordWrap, f_rest);
-
-  //  //If the text overflows, make it snap to bottom
-  //  if (bounding_rect.height() > ui_vp_message->height())
-  //  {
-
-  //    QScrollBar *scroll = ui_vp_message->verticalScrollBar();
-  //    scroll->value();
-  //    scroll->setValue(scroll->maximum());
-  //  }
-
     // Keep the speed at bay.
     if (current_display_speed < 0)
       current_display_speed = 0;