From 8c2eeca9d790959bc5f0d6f1baf57884088b2dc2 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 11 Mar 2019 01:27:08 +0100 Subject: [PATCH 01/19] update project file --- Attorney_Online.pro | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c0bc4ab..c063740 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -12,7 +12,15 @@ MOC_DIR = $$PWD/build SOURCES += $$files($$PWD/src/*.cpp) HEADERS += $$files($$PWD/include/*.h) -LIBS += -L$$PWD/lib -lbass -ldiscord-rpc + + +LIBS += -L$$PWD/lib -ldiscord-rpc + +#AUDIO = BASS + +equals(AUDIO, "BASS") { +LIBS += -L$$PWD/lib -lbass +} CONFIG += c++14 From 2f759752b0dfbb2a21bb0eac3feb0d6222fa2615 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:26:01 +0100 Subject: [PATCH 02/19] update gitignore so it leaves my base folder alone --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6ac11d6..02a6b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ base_override.h base-full/ +base/ bass.lib bin/ From 49938eea0f86e13639b072355e1bd97900662e4f Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:26:40 +0100 Subject: [PATCH 03/19] makes all the bass stuff optional --- src/aoblipplayer.cpp | 7 ++++++- src/aomusicplayer.cpp | 6 ++++++ src/aooptionsdialog.cpp | 4 +++- src/aosfxplayer.cpp | 6 ++++++ src/courtroom.cpp | 11 +++++++++-- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index 74757c5..0a8b427 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -12,9 +12,11 @@ void AOBlipPlayer::set_blips(QString p_sfx) for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) { + #ifdef BASSAUDIO BASS_StreamFree(m_stream_list[n_stream]); m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); + #endif } set_volume(m_volume); @@ -28,10 +30,11 @@ void AOBlipPlayer::blip_tick() m_cycle = 0; HSTREAM f_stream = m_stream_list[f_cycle]; - + #ifdef BASSAUDIO if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(f_stream, BASS_GetDevice()); BASS_ChannelPlay(f_stream, false); + #endif } void AOBlipPlayer::set_volume(int p_value) @@ -42,6 +45,8 @@ void AOBlipPlayer::set_volume(int p_value) for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) { + #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume); + #endif } } diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp index 997d82d..521fae9 100644 --- a/src/aomusicplayer.cpp +++ b/src/aomusicplayer.cpp @@ -8,11 +8,14 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) AOMusicPlayer::~AOMusicPlayer() { + #ifdef BASSAUDIO BASS_ChannelStop(m_stream); + #endif } void AOMusicPlayer::play(QString p_song) { + #ifdef BASSAUDIO BASS_ChannelStop(m_stream); QString f_path = ao_app->get_music_path(p_song); @@ -24,11 +27,14 @@ void AOMusicPlayer::play(QString p_song) if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelPlay(m_stream, false); +#endif } void AOMusicPlayer::set_volume(int p_value) { m_volume = p_value; float volume = m_volume / 100.0f; + #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); + #endif } diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index cd69c76..0f6a054 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -199,6 +199,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi ui_callwords_layout->addWidget(ui_callwords_explain_lbl); // The audio tab. + #ifdef BASSAUDIO ui_audio_tab = new QWidget(); ui_settings_tabs->addTab(ui_audio_tab, tr("Audio")); @@ -218,7 +219,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi ui_audio_device_combobox = new QComboBox(ui_audio_widget); - // Let's fill out the combobox with the available audio devices. + // Let's fill out the combobox with the available audio devices. Or don't if there is no audio int a = 0; BASS_DEVICEINFO info; @@ -311,6 +312,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi ui_blank_blips_cb->setChecked(p_ao_app->get_blank_blip()); ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb); + #endif // The casing tab! ui_casing_tab = new QWidget(); diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 7fe7987..869fa9b 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -9,6 +9,7 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) { + #ifdef BASSAUDIO BASS_ChannelStop(m_stream); QString misc_path = ""; @@ -36,16 +37,21 @@ 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); +#endif } void AOSfxPlayer::stop() { + #ifdef BASSAUDIO BASS_ChannelStop(m_stream); + #endif } void AOSfxPlayer::set_volume(int p_value) { m_volume = p_value; float volume = p_value / 100.0f; + #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); + #endif } diff --git a/src/courtroom.cpp b/src/courtroom.cpp index be7629b..6a5379a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3,7 +3,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - + #ifdef BASSAUDIO // Change the default audio output device to be the one the user has given // in his config.ini file for now. int a = 0; @@ -28,6 +28,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() } } } + #endif keepalive_timer = new QTimer(this); keepalive_timer->start(60000); @@ -3498,23 +3499,29 @@ Courtroom::~Courtroom() delete blip_player; } + #if (defined (_WIN32) || defined (_WIN64)) void Courtroom::load_bass_opus_plugin() { + #ifdef BASSAUDIO BASS_PluginLoad("bassopus.dll", 0); + #endif } #elif (defined (LINUX) || defined (__linux__)) void Courtroom::load_bass_opus_plugin() { + #ifdef BASSAUDIO BASS_PluginLoad("libbassopus.so", 0); + #endif } #elif defined __APPLE__ void Courtroom::load_bass_opus_plugin() { QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib"; QByteArray ba = libpath.toLocal8Bit(); - + #ifdef BASSAUDIO BASS_PluginLoad(ba.data(), 0); + #endif } #else #error This operating system is unsupported for bass plugins. From e4edb7e127b0513aec7ebe62da5c542ef6def7ce Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:00 +0100 Subject: [PATCH 04/19] project rules where i can configure stuff --- Attorney_Online.pro | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c063740..e5ea474 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -14,15 +14,21 @@ SOURCES += $$files($$PWD/src/*.cpp) HEADERS += $$files($$PWD/include/*.h) -LIBS += -L$$PWD/lib -ldiscord-rpc +LIBS += -L$$PWD/lib -#AUDIO = BASS +DISCORD = NO -equals(AUDIO, "BASS") { -LIBS += -L$$PWD/lib -lbass +equals(DISCORD, "YES") { +LIBS += -ldiscord-rpc +DEFINES += DISCORD } -CONFIG += c++14 +AUDIO += NO + +equals(AUDIO, "BASSAUDIO") { +LIBS += -lbass +DEFINES += BASSAUDIO +} RESOURCES += resources.qrc From 744c100159ff7b79e01c40ec57e42d37650d139b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:11 +0100 Subject: [PATCH 05/19] make discord optional --- src/discord_rich_presence.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 10f5833..0bb7f9f 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -4,6 +4,7 @@ namespace AttorneyOnline { Discord::Discord() { + #ifdef DISCORD DiscordEventHandlers handlers; std::memset(&handlers, 0, sizeof(handlers)); handlers = {}; @@ -18,15 +19,19 @@ Discord::Discord() }; qInfo() << "Initializing Discord RPC"; Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); + #endif } Discord::~Discord() { + #ifdef DISCORD Discord_Shutdown(); + #endif } void Discord::state_lobby() { + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -36,12 +41,13 @@ void Discord::state_lobby() presence.state = "In Lobby"; presence.details = "Idle"; Discord_UpdatePresence(&presence); + #endif } void Discord::state_server(std::string name, std::string server_id) { qDebug() << "Discord RPC: Setting server state"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -59,6 +65,7 @@ void Discord::state_server(std::string name, std::string server_id) this->server_name = name; this->timestamp = timestamp; Discord_UpdatePresence(&presence); + #endif } void Discord::state_character(std::string name) @@ -67,7 +74,7 @@ void Discord::state_character(std::string name) auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString(); const std::string playing_as = "Playing as " + name_friendly; qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str() << ")"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -81,12 +88,13 @@ void Discord::state_character(std::string name) presence.smallImageKey = name_internal.c_str(); // presence.smallImageText = name_internal.c_str(); Discord_UpdatePresence(&presence); + #endif } void Discord::state_spectate() { qDebug() << "Discord RPC: Setting specator state"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -98,6 +106,7 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); + #endif } } From 8a23f1004027d3f3de9d97e55e9a97fd73f3eb74 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:22 +0100 Subject: [PATCH 06/19] gcc didn't like that --- include/aoapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/aoapplication.h b/include/aoapplication.h index 44aef7a..6c8039c 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -94,9 +94,9 @@ public: //////////////////versioning/////////////// - constexpr int get_release() const { return RELEASE; } - constexpr int get_major_version() const { return MAJOR_VERSION; } - constexpr int get_minor_version() const { return MINOR_VERSION; } + const int get_release() const { return RELEASE; } + const int get_major_version() const { return MAJOR_VERSION; } + const int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// From dbb05f2b4b0b32ae1b49735847211df6464c59af Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:31:01 +0100 Subject: [PATCH 07/19] c++ 14 i guess this is important --- Attorney_Online.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index e5ea474..357958f 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -30,6 +30,8 @@ LIBS += -lbass DEFINES += BASSAUDIO } +CONFIG += c++14 + RESOURCES += resources.qrc win32:RC_ICONS = resource/logo.ico From fced80661c1342e8622dba9f35c7db43d69e52a9 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:46:27 +0100 Subject: [PATCH 08/19] looks like multimedia isn't really necessary --- Attorney_Online.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 357958f..c2bd7e9 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -1,4 +1,4 @@ -QT += core gui widgets multimedia network +QT += core gui widgets network TARGET = Attorney_Online TEMPLATE = app From 92c54ba2ebee12a87360d00f2982a9083f06166d Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:27:13 +0100 Subject: [PATCH 09/19] Revert "make discord optional" This reverts commit 744c100159ff7b79e01c40ec57e42d37650d139b. --- src/discord_rich_presence.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 0bb7f9f..10f5833 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -4,7 +4,6 @@ namespace AttorneyOnline { Discord::Discord() { - #ifdef DISCORD DiscordEventHandlers handlers; std::memset(&handlers, 0, sizeof(handlers)); handlers = {}; @@ -19,19 +18,15 @@ Discord::Discord() }; qInfo() << "Initializing Discord RPC"; Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); - #endif } Discord::~Discord() { - #ifdef DISCORD Discord_Shutdown(); - #endif } void Discord::state_lobby() { - #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -41,13 +36,12 @@ void Discord::state_lobby() presence.state = "In Lobby"; presence.details = "Idle"; Discord_UpdatePresence(&presence); - #endif } void Discord::state_server(std::string name, std::string server_id) { qDebug() << "Discord RPC: Setting server state"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -65,7 +59,6 @@ void Discord::state_server(std::string name, std::string server_id) this->server_name = name; this->timestamp = timestamp; Discord_UpdatePresence(&presence); - #endif } void Discord::state_character(std::string name) @@ -74,7 +67,7 @@ void Discord::state_character(std::string name) auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString(); const std::string playing_as = "Playing as " + name_friendly; qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str() << ")"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -88,13 +81,12 @@ void Discord::state_character(std::string name) presence.smallImageKey = name_internal.c_str(); // presence.smallImageText = name_internal.c_str(); Discord_UpdatePresence(&presence); - #endif } void Discord::state_spectate() { qDebug() << "Discord RPC: Setting specator state"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -106,7 +98,6 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); - #endif } } From 3fb6b50d104b5ed247ffe7a0ac03d0a7049d522a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:27:38 +0100 Subject: [PATCH 10/19] cleanup qmakefile --- Attorney_Online.pro | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c2bd7e9..351f2b3 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -16,18 +16,22 @@ HEADERS += $$files($$PWD/include/*.h) LIBS += -L$$PWD/lib -DISCORD = NO +#DEFINES += DISCORD -equals(DISCORD, "YES") { +contains(DEFINES, DISCORD) { LIBS += -ldiscord-rpc -DEFINES += DISCORD } -AUDIO += NO +#DEFINES += BASSAUDIO -equals(AUDIO, "BASSAUDIO") { +contains(DEFINES, BASSAUDIO) { LIBS += -lbass -DEFINES += BASSAUDIO +} + +#DEFINES += QTAUDIO + +contains(DEFINES, QTAUDIO) { +QT += multimedia } CONFIG += c++14 From 6e93d6e1bea8fd539499625f2a980acd83ef424e Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:30:03 +0100 Subject: [PATCH 11/19] discord optional v2 --- src/discord_rich_presence.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 10f5833..a310a68 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -2,6 +2,7 @@ namespace AttorneyOnline { +#ifdef DISCORD Discord::Discord() { DiscordEventHandlers handlers; @@ -99,5 +100,36 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); } +#else +Discord::Discord() +{ } + +Discord::~Discord() +{ + +} + +void Discord::state_lobby() +{ + +} + +void Discord::state_server(std::string name, std::string server_id) +{ + qDebug() << "Discord RPC: Setting server state"; +} + +void Discord::state_character(std::string name) +{ + qDebug() << "Discord RPC: Setting character state"; +} + +void Discord::state_spectate() +{ + qDebug() << "Discord RPC: Setting specator state"; + +} +#endif +} From 0b6f376f8f635bfcfd72f621a1077a35efc72342 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:53:06 +0100 Subject: [PATCH 12/19] qt can play the blips just fine --- include/aoblipplayer.h | 42 +++++++++++++++++++++++++ src/aoblipplayer.cpp | 70 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 106 insertions(+), 6 deletions(-) diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index aebba77..2bbe718 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -1,13 +1,19 @@ #ifndef AOBLIPPLAYER_H #define AOBLIPPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif + #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOBlipPlayer { public: @@ -26,5 +32,41 @@ private: int m_volume; HSTREAM m_stream_list[5]; }; +#elif defined(QTAUDIO) +class AOBlipPlayer +{ +public: + AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); + + void set_blips(QString p_sfx); + void blip_tick(); + void set_volume(int p_volume); + + int m_cycle = 0; + +private: + QSoundEffect m_blips; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume; + //HSTREAM m_stream_list[5]; +}; +#else +class AOBlipPlayer +{ +public: + AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); + + void set_blips(QString p_sfx); + void blip_tick(); + void set_volume(int p_volume); + +private: + QWidget *m_parent; + AOApplication *ao_app; +}; +#endif + #endif // AOBLIPPLAYER_H diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index 0a8b427..b95f32a 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -1,5 +1,6 @@ #include "aoblipplayer.h" +#if defined(BASSAUDIO) //Using bass.dll for the blips AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) { m_parent = parent; @@ -12,11 +13,9 @@ void AOBlipPlayer::set_blips(QString p_sfx) for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) { - #ifdef BASSAUDIO BASS_StreamFree(m_stream_list[n_stream]); m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); - #endif } set_volume(m_volume); @@ -30,11 +29,9 @@ void AOBlipPlayer::blip_tick() m_cycle = 0; HSTREAM f_stream = m_stream_list[f_cycle]; - #ifdef BASSAUDIO if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(f_stream, BASS_GetDevice()); BASS_ChannelPlay(f_stream, false); - #endif } void AOBlipPlayer::set_volume(int p_value) @@ -45,8 +42,69 @@ void AOBlipPlayer::set_volume(int p_value) for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) { - #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume); - #endif } } +#elif defined(QTAUDIO) //Using Qt's QSoundEffect class +AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) +{ + m_parent = parent; + ao_app = p_ao_app; +} + +void AOBlipPlayer::set_blips(QString p_sfx) +{ + QString f_path = ao_app->get_sounds_path(p_sfx); + + for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) + { + m_blips.setSource(QUrl::fromLocalFile(f_path)); + } + + set_volume(m_volume); +} + +void AOBlipPlayer::blip_tick() +{ + int f_cycle = m_cycle++; + + if (m_cycle == 5) + m_cycle = 0; + + //HSTREAM f_stream = m_stream_list[f_cycle]; + //if (ao_app->get_audio_output_device() != "default") + //BASS_ChannelSetDevice(f_stream, BASS_GetDevice()); + //BASS_ChannelPlay(f_stream, false); + m_blips.play(); +} + +void AOBlipPlayer::set_volume(int p_value) +{ + m_volume = p_value; + + float volume = p_value / 100.0f; + + m_blips.setVolume(volume); +} +#else //No audio +AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) +{ + m_parent = parent; + ao_app = p_ao_app; +} + +void AOBlipPlayer::set_blips(QString p_sfx) +{ + +} + +void AOBlipPlayer::blip_tick() +{ + +} + +void AOBlipPlayer::set_volume(int p_value) +{ + +} +#endif From 71da60b5d6f77629b73fd232f97bed2ecaefb4c3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 20:14:54 +0100 Subject: [PATCH 13/19] sfx tested and works --- include/aosfxplayer.h | 40 +++++++++++++++++++++++ src/aosfxplayer.cpp | 76 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 30cbe9d..5b82534 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -1,13 +1,19 @@ #ifndef AOSFXPLAYER_H #define AOSFXPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif + #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOSfxPlayer { public: @@ -24,5 +30,39 @@ private: int m_volume = 0; HSTREAM m_stream; }; +#elif defined(QTAUDIO) +class AOSfxPlayer +{ +public: + AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); + + void play(QString p_sfx, QString p_char = "", QString shout = ""); + void stop(); + void set_volume(int p_volume); + +private: + QSoundEffect m_sfx; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#else +class AOSfxPlayer +{ +public: + AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); + + void play(QString p_sfx, QString p_char = "", QString shout = ""); + void stop(); + void set_volume(int p_volume); + +private: + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#endif #endif // AOSFXPLAYER_H diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 869fa9b..077767b 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -1,6 +1,7 @@ #include "aosfxplayer.h" #include "file_functions.h" +#if defined(BASSAUDIO) //Using bass.dll for sfx AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) { m_parent = parent; @@ -9,7 +10,6 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) { - #ifdef BASSAUDIO BASS_ChannelStop(m_stream); QString misc_path = ""; @@ -37,21 +37,85 @@ 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); -#endif } void AOSfxPlayer::stop() { - #ifdef BASSAUDIO BASS_ChannelStop(m_stream); - #endif } void AOSfxPlayer::set_volume(int p_value) { m_volume = p_value; float volume = p_value / 100.0f; - #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); - #endif } +#elif defined(QTAUDIO) //Using Qt's QSoundEffect class +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) +{ + m_sfx.stop(); + + QString misc_path = ""; + QString char_path = ""; + QString sound_path = ao_app->get_sounds_path(p_sfx); + + if (shout != "") + misc_path = ao_app->get_base_path() + "misc/" + shout + "/" + p_sfx; + if (p_char != "") + char_path = ao_app->get_character_path(p_char, p_sfx); + + QString f_path; + + if (file_exists(char_path)) + f_path = char_path; + else if (file_exists(misc_path)) + f_path = misc_path; + else + f_path = sound_path; + + m_sfx.setSource(QUrl::fromLocalFile(f_path)); + + set_volume(m_volume); + + m_sfx.play(); +} + +void AOSfxPlayer::stop() +{ + m_sfx.stop(); +} + +void AOSfxPlayer::set_volume(int p_value) +{ + m_volume = p_value; + float volume = p_value / 100.0f; + m_sfx.setVolume(volume); +} +#else +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::stop() +{ + +} + +void AOSfxPlayer::set_volume(int p_value) +{ + +} +#endif From 1514ffea6ad747fc93f98752abb8f82acc9dc9bd Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 20:47:47 +0100 Subject: [PATCH 14/19] qt music --- include/aomusicplayer.h | 37 ++++++++++++++++++++++++++ src/aomusicplayer.cpp | 59 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h index 560a7f9..b34267c 100644 --- a/include/aomusicplayer.h +++ b/include/aomusicplayer.h @@ -1,13 +1,18 @@ #ifndef AOMUSICPLAYER_H #define AOMUSICPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOMusicPlayer { public: @@ -24,5 +29,37 @@ private: int m_volume = 0; HSTREAM m_stream; }; +#elif defined(QTAUDIO) +class AOMusicPlayer +{ +public: + AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); + ~AOMusicPlayer(); + + void play(QString p_song); + void set_volume(int p_value); + +private: + QMediaPlayer m_player; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#else +class AOMusicPlayer +{ +public: + AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); + ~AOMusicPlayer(); + + void play(QString p_song); + void set_volume(int p_value); + +private: + QWidget *m_parent; + AOApplication *ao_app; +}; +#endif #endif // AOMUSICPLAYER_H diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp index 521fae9..2791809 100644 --- a/src/aomusicplayer.cpp +++ b/src/aomusicplayer.cpp @@ -1,5 +1,6 @@ #include "aomusicplayer.h" +#if defined(BASSAUDIO) AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) { m_parent = parent; @@ -8,14 +9,11 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) AOMusicPlayer::~AOMusicPlayer() { - #ifdef BASSAUDIO BASS_ChannelStop(m_stream); - #endif } void AOMusicPlayer::play(QString p_song) { - #ifdef BASSAUDIO BASS_ChannelStop(m_stream); QString f_path = ao_app->get_music_path(p_song); @@ -27,14 +25,63 @@ void AOMusicPlayer::play(QString p_song) if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelPlay(m_stream, false); -#endif } void AOMusicPlayer::set_volume(int p_value) { m_volume = p_value; float volume = m_volume / 100.0f; - #ifdef BASSAUDIO BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); - #endif } +#elif defined(QTAUDIO) +AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) +{ + m_parent = parent; + ao_app = p_ao_app; +} + +AOMusicPlayer::~AOMusicPlayer() +{ + m_player.stop(); +} + +void AOMusicPlayer::play(QString p_song) +{ + m_player.stop(); + + QString f_path = ao_app->get_music_path(p_song); + + m_player.setMedia(QUrl::fromLocalFile(f_path)); + + this->set_volume(m_volume); + + m_player.play(); +} + +void AOMusicPlayer::set_volume(int p_value) +{ + m_volume = p_value; + m_player.setVolume(m_volume); +} +#else +AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) +{ + m_parent = parent; + ao_app = p_ao_app; +} + +AOMusicPlayer::~AOMusicPlayer() +{ + +} + +void AOMusicPlayer::play(QString p_song) +{ + +} + +void AOMusicPlayer::set_volume(int p_value) +{ + +} +#endif From 1504aaf6b2df422405b2cc6bd6e4f79de36e53c4 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 13:05:10 +0100 Subject: [PATCH 15/19] saves space i guess --- include/aoblipplayer.h | 40 ++++------------------------------------ include/aosfxplayer.h | 38 +++----------------------------------- 2 files changed, 7 insertions(+), 71 deletions(-) diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 2bbe718..102a040 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -13,7 +13,7 @@ #include #include -#if defined(BASSAUDIO) + class AOBlipPlayer { public: @@ -30,43 +30,11 @@ private: AOApplication *ao_app; int m_volume; + #if defined(BASSAUDIO) HSTREAM m_stream_list[5]; -}; -#elif defined(QTAUDIO) -class AOBlipPlayer -{ -public: - AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); - - void set_blips(QString p_sfx); - void blip_tick(); - void set_volume(int p_volume); - - int m_cycle = 0; - -private: + #elif defined(QTAUDIO) QSoundEffect m_blips; - QWidget *m_parent; - AOApplication *ao_app; - - int m_volume; - //HSTREAM m_stream_list[5]; + #endif }; -#else -class AOBlipPlayer -{ -public: - AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); - - void set_blips(QString p_sfx); - void blip_tick(); - void set_volume(int p_volume); - -private: - QWidget *m_parent; - AOApplication *ao_app; -}; -#endif - #endif // AOBLIPPLAYER_H diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 5b82534..4b97685 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -13,7 +13,6 @@ #include #include -#if defined(BASSAUDIO) class AOSfxPlayer { public: @@ -26,43 +25,12 @@ public: private: QWidget *m_parent; AOApplication *ao_app; - - int m_volume = 0; + #if defined(BASSAUDIO) HSTREAM m_stream; -}; -#elif defined(QTAUDIO) -class AOSfxPlayer -{ -public: - AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); - - void play(QString p_sfx, QString p_char = "", QString shout = ""); - void stop(); - void set_volume(int p_volume); - -private: + #elif defined(QTAUDIO) QSoundEffect m_sfx; - QWidget *m_parent; - AOApplication *ao_app; - + #endif int m_volume = 0; }; -#else -class AOSfxPlayer -{ -public: - AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); - - void play(QString p_sfx, QString p_char = "", QString shout = ""); - void stop(); - void set_volume(int p_volume); - -private: - QWidget *m_parent; - AOApplication *ao_app; - - int m_volume = 0; -}; -#endif #endif // AOSFXPLAYER_H From ece08930e3767def9895dbfa23936ce23ec96c73 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 13:06:11 +0100 Subject: [PATCH 16/19] setVolume doesn't take floats --- src/aoblipplayer.cpp | 5 +---- src/aosfxplayer.cpp | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index b95f32a..ffeb888 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -81,10 +81,7 @@ void AOBlipPlayer::blip_tick() void AOBlipPlayer::set_volume(int p_value) { m_volume = p_value; - - float volume = p_value / 100.0f; - - m_blips.setVolume(volume); + m_blips.setVolume(m_volume); } #else //No audio AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 077767b..9f47e01 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -94,8 +94,7 @@ void AOSfxPlayer::stop() void AOSfxPlayer::set_volume(int p_value) { m_volume = p_value; - float volume = p_value / 100.0f; - m_sfx.setVolume(volume); + m_sfx.setVolume(m_volume); } #else AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) From bdde8822f4bb2ce2ef4e95fecb23c17afc0adcac Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 21:36:12 +0100 Subject: [PATCH 17/19] begone, commented code --- src/aoblipplayer.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index ffeb888..4dfb895 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -71,10 +71,6 @@ void AOBlipPlayer::blip_tick() if (m_cycle == 5) m_cycle = 0; - //HSTREAM f_stream = m_stream_list[f_cycle]; - //if (ao_app->get_audio_output_device() != "default") - //BASS_ChannelSetDevice(f_stream, BASS_GetDevice()); - //BASS_ChannelPlay(f_stream, false); m_blips.play(); } From 44d433d941575da0a16d3ad9c905ba71ec20d19c Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 22:05:24 +0100 Subject: [PATCH 18/19] sfx glitch --- src/aosfxplayer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 9f47e01..710d7a8 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -79,11 +79,14 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) else f_path = sound_path; + if (file_exists(f_path)) //if its missing, it will glitch out + { m_sfx.setSource(QUrl::fromLocalFile(f_path)); set_volume(m_volume); m_sfx.play(); + } } void AOSfxPlayer::stop() From 785168f8d36fc7c075f36cd88f13984c933b903c Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 22:05:36 +0100 Subject: [PATCH 19/19] add a default for this --- src/text_file_functions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 1e920d7..45e2e79 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -443,8 +443,9 @@ QString AOApplication::get_chat(QString p_char) QString AOApplication::get_char_shouts(QString p_char) { QString f_result = read_char_ini(p_char, "shouts", "Options"); - - return f_result; + if (f_result == "") + return "default"; + else return f_result; } int AOApplication::get_preanim_duration(QString p_char, QString p_emote)