Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove all traces of bass

Browse Source
This commit is contained in:
gameboyprinter 2018-08-29 00:29:18 -05:00
parent 2fed94b2d1
commit 5bd40225bd
4 changed files with 5 additions and 1066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Attorney_Online_remake.pro
View File

@ -69,7 +69,6 @@ HEADERS += lobby.h \
misc_functions.h \ misc_functions.h \
aocharmovie.h \ aocharmovie.h \
aoemotebutton.h \ aoemotebutton.h \
bass.h \
aosfxplayer.h \ aosfxplayer.h \
aomusicplayer.h \ aomusicplayer.h \
aoblipplayer.h \ aoblipplayer.h \
@ -81,15 +80,11 @@ HEADERS += lobby.h \
discord_rich_presence.h \ discord_rich_presence.h \
discord-rpc.h discord-rpc.h
# 1. You need to get BASS and put the x86 bass DLL/headers in the project root folder # You need to compile the Discord Rich Presence SDK separately and add the lib/headers.
# AND the compilation output folder. If you want a static link, you'll probably # Discord RPC uses CMake, which does not play nicely with QMake, so this step must be manual.
# need the .lib file too. MinGW-GCC is really finicky finding BASS, it seems.
# 2. You need to compile the Discord Rich Presence SDK separately and add the lib/headers unix:LIBS += -L$$PWD -ldiscord-rpc
# in the same way as BASS. Discord RPC uses CMake, which does not play nicely with win32:LIBS += -L$$PWD -ldiscord-rpc #"$$PWD/discord-rpc.dll"
# QMake, so this step must be manual.
unix:LIBS += -L$$PWD -lbass -ldiscord-rpc
win32:LIBS += -L$$PWD "$$PWD/bass.dll" -ldiscord-rpc #"$$PWD/discord-rpc.dll"
android:LIBS += -L$$PWD\android\libs\armeabi-v7a\ -lbass
CONFIG += c++11 CONFIG += c++11

1
aoblipplayer.h
View File

@ -1,7 +1,6 @@
#ifndef AOBLIPPLAYER_H #ifndef AOBLIPPLAYER_H
#define AOBLIPPLAYER_H #define AOBLIPPLAYER_H
#include "bass.h"
#include "aoapplication.h" #include "aoapplication.h"
#include <QWidget> #include <QWidget>

1051
bass.h
View File

File diff suppressed because it is too large Load Diff

4
courtroom.cpp
View File

@ -4,10 +4,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
//initializing sound device
BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, 0, NULL);
BASS_PluginLoad("bassopus.dll", BASS_UNICODE);
keepalive_timer = new QTimer(this); keepalive_timer = new QTimer(this);
keepalive_timer->start(60000); keepalive_timer->start(60000);