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

Opus on SFX

Browse Source
This commit is contained in:
iamgoofball 2018-10-16 01:22:07 -07:00
parent 4858904d11
commit d1347b2243
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aoapplication.h
View File

@ -169,6 +169,9 @@ public:
//Returns the sfx with p_identifier from sounds.ini in the current theme path //Returns the sfx with p_identifier from sounds.ini in the current theme path
QString get_sfx(QString p_identifier); QString get_sfx(QString p_identifier);
//Figure out if we can opus this or if we should fall back to wav
QString get_sfx_suffix(QString sound_to_check);
//Returns the value of p_search_line within target_tag and terminator_tag //Returns the value of p_search_line within target_tag and terminator_tag
QString read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag); QString read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag);

9
courtroom.cpp
View File

@ -1377,7 +1377,7 @@ void Courtroom::play_sfx()
if (sfx_name == "1") if (sfx_name == "1")
return; return;
sfx_player->play(sfx_name + ".wav"); sfx_player->play(ao_app->get_sfx_suffix(sfx_name));
} }
void Courtroom::set_scene() void Courtroom::set_scene()
@ -1488,12 +1488,13 @@ void Courtroom::set_text_color()
ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: yellow"); "color: yellow");
break; break;
default:
qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
case WHITE: case WHITE:
ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white"); "color: white");
break;
default:
qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
} }
} }

22
text_file_functions.cpp
View File

@ -340,6 +340,26 @@ QString AOApplication::get_sfx(QString p_identifier)
return return_sfx; return return_sfx;
} }
QString AOApplication::get_sfx_suffix(QString sound_to_check)
{
QString wav_check = get_sounds_path() + sound_to_check + ".wav";
QString mp3_check = get_sounds_path() + sound_to_check + ".mp3";
QString opus_check = get_sounds_path() + sound_to_check + ".opus";
if(file_exists(opus_check))
{
return sound_to_check + ".opus";
}
if(file_exists(mp3_check))
{
return sound_to_check + ".mp3";
}
if(file_exists(wav_check))
{
return sound_to_check + ".wav";
}
return sound_to_check + ".wav";
}
//returns whatever is to the right of "search_line =" within target_tag and terminator_tag, trimmed //returns whatever is to the right of "search_line =" within target_tag and terminator_tag, trimmed
//returns the empty string if the search line couldnt be found //returns the empty string if the search line couldnt be found
QString AOApplication::read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag) QString AOApplication::read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag)
@ -586,4 +606,4 @@ bool AOApplication::ic_scroll_down_enabled()
{ {
QString f_result = read_config("ic_scroll_down"); QString f_result = read_config("ic_scroll_down");
return f_result.startsWith("true"); return f_result.startsWith("true");
} }