mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-24 20:59:29 +00:00
add advanced sound tab to pref...
...allowing you to play with sample_rate and buffer_size options set default sample_rate to 44100 as most user got pb with 22050
This commit is contained in:
Serge Martin
parent
6b258a6a15
commit
d9ece2f276
11
changelog
11
changelog
@ -12,6 +12,9 @@ Version 1.2-svn
|
||||
* correctly use translated team names when available
|
||||
* fix the completion when controlling multiple sides (bug #8101, patch #653)
|
||||
* first turn of a game is saved again (fixes bug #7909 and bug #8117)
|
||||
* sound
|
||||
* add advanced sound tab to pref allowing you to play with sample_rate and buffer_size options
|
||||
* set default sample rate to 44100 hz as most user got cracking sound pb with 22050
|
||||
|
||||
Version 1.2:
|
||||
* campaigns:
|
||||
@ -74,7 +77,7 @@ Version 1.1.14:
|
||||
* fixed glitches with impassable moutains at the edges of maps
|
||||
* resolved all glitches with cave walls
|
||||
* units:
|
||||
* new teamcolored baseframes: Halberdier, Heavy Infanfantry, Pikeman,
|
||||
* new teamcolored baseframes: Halberdier, Heavy Infanfantry, Pikeman,
|
||||
Shocktrooper, Siegetrooper
|
||||
* new baseframe: Yeti
|
||||
* some new skulls for skeleton units
|
||||
@ -89,8 +92,8 @@ Version 1.1.14:
|
||||
* updated man-pages: French, German
|
||||
* updated translations: Czech, Esperanto, French, Greek, Italian, Russian
|
||||
* multiplayer maps:
|
||||
* revised multiplayer maps: 3p Morituri, 4p Morituri, Blue Water Province,
|
||||
Den of Onis, Hexcake, Isar's Cross, Merkwuerdigliebe, Meteor Lake,
|
||||
* revised multiplayer maps: 3p Morituri, 4p Morituri, Blue Water Province,
|
||||
Den of Onis, Hexcake, Isar's Cross, Merkwuerdigliebe, Meteor Lake,
|
||||
Sablestone Delta, Sulla's Ruins
|
||||
* misc:
|
||||
* fixed a crash in the recall event_handler
|
||||
@ -124,7 +127,7 @@ Version 1.1.13:
|
||||
* added descriptions to the weapons of some campaign units to make sure they
|
||||
are correctly translated
|
||||
* multiplayer maps:
|
||||
* revised multiplayer maps: Charge, Hamlets, Hornshark Island, Silverhead
|
||||
* revised multiplayer maps: Charge, Hamlets, Hornshark Island, Silverhead
|
||||
Crossing, Sulla's Ruins, 3p Morituri
|
||||
* misc bugfixes:
|
||||
* several minor bugs
|
||||
|
||||
@ -178,7 +178,49 @@ void set_language(const std::string& s)
|
||||
|
||||
unsigned int sample_rate()
|
||||
{
|
||||
return lexical_cast_default<unsigned int>(prefs["sample_rate"], 22050);
|
||||
return lexical_cast_default<unsigned int>(prefs["sample_rate"], 44100);
|
||||
}
|
||||
|
||||
void save_sample_rate(const unsigned int rate)
|
||||
{
|
||||
const std::string new_rate = lexical_cast_default<std::string>(rate, "44100");
|
||||
if (prefs["sample_rate"] == new_rate)
|
||||
return;
|
||||
|
||||
prefs["sample_rate"] = new_rate;
|
||||
|
||||
//if audio is open we have to re set sample rate
|
||||
sound::reset_sound();
|
||||
}
|
||||
|
||||
size_t sound_buffer_size()
|
||||
{
|
||||
//sounds don't sound good on Windows unless the buffer size is 4k,
|
||||
//but this seems to cause crashes on other systems...
|
||||
#ifdef WIN32
|
||||
const size_t buf_size = 4096;
|
||||
#else
|
||||
const size_t buf_size = 1024;
|
||||
#endif
|
||||
|
||||
return lexical_cast_default<size_t>(prefs["sound_buffer_size"], buf_size);
|
||||
}
|
||||
|
||||
void save_sound_buffer_size(const size_t size)
|
||||
{
|
||||
#ifdef WIN32
|
||||
const char* buf_size = "4096";
|
||||
#else
|
||||
const char* buf_size = "1024";
|
||||
#endif
|
||||
|
||||
const std::string new_size = lexical_cast_default<std::string>(size, buf_size);
|
||||
if (prefs["sound_buffer_size"] == new_size)
|
||||
return;
|
||||
|
||||
prefs["sound_buffer_size"] = new_size;
|
||||
|
||||
sound::reset_sound();
|
||||
}
|
||||
|
||||
int music_volume()
|
||||
|
||||
@ -65,6 +65,10 @@ namespace preferences {
|
||||
bool set_sound(bool ison);
|
||||
|
||||
unsigned int sample_rate();
|
||||
void save_sample_rate(const unsigned int rate);
|
||||
|
||||
size_t sound_buffer_size();
|
||||
void save_sound_buffer_size(const size_t size);
|
||||
|
||||
int sound_volume();
|
||||
void set_sound_volume(int vol);
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
#include "widgets/label.hpp"
|
||||
#include "widgets/menu.hpp"
|
||||
#include "widgets/slider.hpp"
|
||||
#include "widgets/textbox.hpp"
|
||||
#include "theme.hpp"
|
||||
|
||||
#include <vector>
|
||||
@ -192,19 +193,27 @@ private:
|
||||
const config* get_advanced_pref() const;
|
||||
void set_advanced_menu();
|
||||
|
||||
gui::slider music_slider_, sound_slider_, scroll_slider_, gamma_slider_, chat_lines_slider_;
|
||||
gui::slider music_slider_, sound_slider_, scroll_slider_, gamma_slider_, chat_lines_slider_,
|
||||
buffer_size_slider_;
|
||||
gui::button fullscreen_button_, turbo_button_, show_ai_moves_button_,
|
||||
show_grid_button_, show_lobby_joins_button_, show_floating_labels_button_, turn_dialog_button_,
|
||||
turn_bell_button_, show_team_colours_button_, show_colour_cursors_button_,
|
||||
show_haloing_button_, video_mode_button_, theme_button_, hotkeys_button_, gamma_button_,
|
||||
flip_time_button_, advanced_button_, sound_button_, music_button_, chat_timestamp_button_;
|
||||
gui::label music_label_, sound_label_, scroll_label_, gamma_label_, chat_lines_label_;
|
||||
flip_time_button_, advanced_button_, sound_button_, music_button_, chat_timestamp_button_,
|
||||
advanced_sound_button_, normal_sound_button_,
|
||||
sample_rate_button1_, sample_rate_button2_, sample_rate_button3_, confirm_sound_button_;
|
||||
gui::label music_label_, sound_label_, scroll_label_, gamma_label_, chat_lines_label_,
|
||||
sample_rate_label_, buffer_size_label_;
|
||||
gui::textbox sample_rate_input_;
|
||||
|
||||
unsigned slider_label_width_;
|
||||
|
||||
gui::menu advanced_;
|
||||
int advanced_selection_;
|
||||
|
||||
enum TAB { GENERAL_TAB, DISPLAY_TAB, SOUND_TAB, MULTIPLAYER_TAB, ADVANCED_TAB };
|
||||
enum TAB { GENERAL_TAB, DISPLAY_TAB, SOUND_TAB, MULTIPLAYER_TAB, ADVANCED_TAB,
|
||||
/*extra tab*/
|
||||
ADVANCED_SOUND_TAB};
|
||||
TAB tab_;
|
||||
display &disp_;
|
||||
const config& game_cfg_;
|
||||
@ -214,6 +223,7 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
|
||||
: gui::preview_pane(disp.video()),
|
||||
music_slider_(disp.video()), sound_slider_(disp.video()),
|
||||
scroll_slider_(disp.video()), gamma_slider_(disp.video()), chat_lines_slider_(disp.video()),
|
||||
buffer_size_slider_(disp.video()),
|
||||
fullscreen_button_(disp.video(), _("Toggle Full Screen"), gui::button::TYPE_CHECK),
|
||||
turbo_button_(disp.video(), _("Accelerated Speed"), gui::button::TYPE_CHECK),
|
||||
show_ai_moves_button_(disp.video(), _("Skip AI Moves"), gui::button::TYPE_CHECK),
|
||||
@ -234,9 +244,19 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
|
||||
sound_button_(disp.video(), _("Sound effects"), gui::button::TYPE_CHECK),
|
||||
music_button_(disp.video(), _("Music"), gui::button::TYPE_CHECK),
|
||||
chat_timestamp_button_(disp.video(), _("Chat Timestamping"), gui::button::TYPE_CHECK),
|
||||
advanced_sound_button_(disp.video(), _("Advanced Mode")),
|
||||
normal_sound_button_(disp.video(), _("Normal Mode")),
|
||||
sample_rate_button1_(disp.video(), "22050", gui::button::TYPE_CHECK),
|
||||
sample_rate_button2_(disp.video(), "44100", gui::button::TYPE_CHECK),
|
||||
sample_rate_button3_(disp.video(), _("User Define"), gui::button::TYPE_CHECK),
|
||||
confirm_sound_button_(disp.video(), _("Apply")),
|
||||
music_label_(disp.video(), _("Music Volume:")), sound_label_(disp.video(), _("SFX Volume:")),
|
||||
scroll_label_(disp.video(), _("Scroll Speed:")), gamma_label_(disp.video(), _("Gamma:")), chat_lines_label_(disp.video(), ""),
|
||||
slider_label_width_(0), advanced_(disp.video(),std::vector<std::string>(),false,-1,-1,NULL,&gui::menu::bluebg_style), advanced_selection_(-1),
|
||||
scroll_label_(disp.video(), _("Scroll Speed:")), gamma_label_(disp.video(), _("Gamma:")),
|
||||
chat_lines_label_(disp.video(), ""),
|
||||
sample_rate_label_(disp.video(), _("Sample Rate (Hz):")), buffer_size_label_(disp.video(),""),
|
||||
sample_rate_input_(disp.video(), 70),
|
||||
slider_label_width_(0), advanced_(disp.video(),
|
||||
std::vector<std::string>(),false,-1,-1,NULL,&gui::menu::bluebg_style), advanced_selection_(-1),
|
||||
tab_(GENERAL_TAB), disp_(disp), game_cfg_(game_cfg)
|
||||
{
|
||||
// FIXME: this box should be vertically centered on the screen, but is not
|
||||
@ -261,6 +281,30 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
|
||||
music_slider_.set_value(music_volume());
|
||||
music_slider_.set_help_string(_("Change the music volume"));
|
||||
|
||||
sample_rate_label_.set_help_string(_("Change the sample rate"));
|
||||
std::string rate = lexical_cast<std::string>(sample_rate());
|
||||
if (rate == "22050")
|
||||
sample_rate_button1_.set_check(true);
|
||||
else if (rate == "44100")
|
||||
sample_rate_button2_.set_check(true);
|
||||
else
|
||||
sample_rate_button3_.set_check(true);
|
||||
sample_rate_input_.set_text(rate);
|
||||
sample_rate_input_.set_help_string(_("User defined sample rate"));
|
||||
confirm_sound_button_.enable(sample_rate_button3_.checked());
|
||||
|
||||
buffer_size_slider_.set_min(0);
|
||||
buffer_size_slider_.set_max(3);
|
||||
int v = sound_buffer_size()/512 - 1;
|
||||
buffer_size_slider_.set_value(v);
|
||||
//avoid sound reset the first time we load advanced sound
|
||||
buffer_size_slider_.value_change();
|
||||
buffer_size_slider_.set_help_string(_("Change the buffer size"));
|
||||
std::stringstream buf;
|
||||
buf << _("Buffer Size: ") << sound_buffer_size();
|
||||
buffer_size_label_.set_text(buf.str());
|
||||
buffer_size_label_.set_help_string(_("Change the buffer size"));
|
||||
|
||||
|
||||
scroll_slider_.set_min(1);
|
||||
scroll_slider_.set_max(100);
|
||||
@ -340,6 +384,7 @@ void preferences_dialog::join()
|
||||
scroll_slider_.join();
|
||||
gamma_slider_.join();
|
||||
chat_lines_slider_.join();
|
||||
buffer_size_slider_.join();
|
||||
fullscreen_button_.join();
|
||||
turbo_button_.join();
|
||||
show_ai_moves_button_.join();
|
||||
@ -360,11 +405,20 @@ void preferences_dialog::join()
|
||||
sound_button_.join();
|
||||
music_button_.join();
|
||||
chat_timestamp_button_.join();
|
||||
advanced_sound_button_.join();
|
||||
normal_sound_button_.join();
|
||||
sample_rate_button1_.join();
|
||||
sample_rate_button2_.join();
|
||||
sample_rate_button3_.join();
|
||||
confirm_sound_button_.join();
|
||||
music_label_.join();
|
||||
sound_label_.join();
|
||||
scroll_label_.join();
|
||||
gamma_label_.join();
|
||||
chat_lines_label_.join();
|
||||
sample_rate_label_.join();
|
||||
buffer_size_label_.join();
|
||||
sample_rate_input_.join();
|
||||
advanced_.join();
|
||||
}
|
||||
|
||||
@ -429,15 +483,43 @@ void preferences_dialog::update_location(SDL_Rect const &rect)
|
||||
const SDL_Rect music_rect = { rect.x + slider_label_width_, ypos,
|
||||
rect.w - slider_label_width_ - right_border, 0 };
|
||||
music_slider_.set_location(music_rect);
|
||||
ypos += item_interline;
|
||||
const int asb_x = rect.x + rect.w - advanced_sound_button_.width() - 20;
|
||||
advanced_sound_button_.set_location(asb_x, ypos);
|
||||
|
||||
// Multiplayer tab
|
||||
ypos = rect.y + top_border;
|
||||
chat_lines_label_.set_location(rect.x, ypos);
|
||||
ypos += 20;
|
||||
SDL_Rect chat_lines_rect = { rect.x + 25, ypos,
|
||||
rect.w - 25 - right_border, 0 };
|
||||
chat_lines_slider_.set_location(chat_lines_rect);
|
||||
ypos += item_interline; chat_timestamp_button_.set_location(rect.x, ypos);
|
||||
//Advanced Sound tab
|
||||
ypos = rect.y + top_border;
|
||||
sample_rate_label_.set_location(rect.x, ypos);
|
||||
ypos += 20;
|
||||
int h_offset = rect.x + 20;
|
||||
sample_rate_button1_.set_location(h_offset, ypos);
|
||||
ypos += 20;
|
||||
sample_rate_button2_.set_location(h_offset, ypos);
|
||||
ypos += 20;
|
||||
sample_rate_button3_.set_location(h_offset, ypos);
|
||||
h_offset += sample_rate_button3_.width() + 5;
|
||||
sample_rate_input_.set_location(h_offset, ypos);
|
||||
h_offset += sample_rate_input_.width() + 5;
|
||||
confirm_sound_button_.set_location(h_offset, ypos);
|
||||
|
||||
ypos += item_interline;
|
||||
buffer_size_label_.set_location(rect.x, ypos);
|
||||
ypos += 20;
|
||||
SDL_Rect buffer_rect = {rect.x + 20, ypos,
|
||||
rect.w - 20 - right_border, 0 };
|
||||
buffer_size_slider_.set_location(buffer_rect);
|
||||
ypos += item_interline;
|
||||
const int nsb_x = rect.x + rect.w - normal_sound_button_.width() - 20;
|
||||
normal_sound_button_.set_location(nsb_x, ypos);
|
||||
|
||||
// Multiplayer tab
|
||||
ypos = rect.y + top_border;
|
||||
chat_lines_label_.set_location(rect.x, ypos);
|
||||
ypos += 20;
|
||||
SDL_Rect chat_lines_rect = { rect.x + 25, ypos,
|
||||
rect.w - 25 - right_border, 0 };
|
||||
chat_lines_slider_.set_location(chat_lines_rect);
|
||||
ypos += item_interline; chat_timestamp_button_.set_location(rect.x, ypos);
|
||||
ypos += item_interline; show_lobby_joins_button_.set_location(rect.x, ypos);
|
||||
|
||||
//Advanced tab
|
||||
@ -503,6 +585,64 @@ void preferences_dialog::process_event()
|
||||
}
|
||||
set_music_volume(music_slider_.value());
|
||||
|
||||
if (advanced_sound_button_.pressed())
|
||||
set_selection(ADVANCED_SOUND_TAB);
|
||||
|
||||
//ADVANCED_SOUND_TAB
|
||||
bool apply = false;
|
||||
std::string rate;
|
||||
|
||||
if (sample_rate_button1_.pressed()) {
|
||||
if (sample_rate_button1_.checked()) {
|
||||
sample_rate_button2_.set_check(false);
|
||||
sample_rate_button3_.set_check(false);
|
||||
confirm_sound_button_.enable(false);
|
||||
apply = true;
|
||||
rate = "22050";
|
||||
} else
|
||||
sample_rate_button1_.set_check(true);
|
||||
}
|
||||
if (sample_rate_button2_.pressed()) {
|
||||
if (sample_rate_button2_.checked()) {
|
||||
sample_rate_button1_.set_check(false);
|
||||
sample_rate_button3_.set_check(false);
|
||||
confirm_sound_button_.enable(false);
|
||||
apply = true;
|
||||
rate = "44100";
|
||||
} else
|
||||
sample_rate_button2_.set_check(true);
|
||||
}
|
||||
if (sample_rate_button3_.pressed()) {
|
||||
if (sample_rate_button3_.checked()) {
|
||||
sample_rate_button1_.set_check(false);
|
||||
sample_rate_button2_.set_check(false);
|
||||
confirm_sound_button_.enable(true);
|
||||
} else
|
||||
sample_rate_button3_.set_check(true);
|
||||
}
|
||||
if (confirm_sound_button_.pressed()) {
|
||||
apply = true;
|
||||
rate = sample_rate_input_.text();
|
||||
}
|
||||
|
||||
if (apply)
|
||||
try {
|
||||
save_sample_rate(lexical_cast<unsigned int>(rate));
|
||||
} catch (bad_lexical_cast&) {
|
||||
}
|
||||
|
||||
if (buffer_size_slider_.value_change()) {
|
||||
const size_t buffer_size = 512 << buffer_size_slider_.value();
|
||||
save_sound_buffer_size(buffer_size);
|
||||
std::stringstream buf;
|
||||
buf << _("Buffer Size: ") << buffer_size;
|
||||
buffer_size_label_.set_text(buf.str());
|
||||
}
|
||||
|
||||
if (normal_sound_button_.pressed())
|
||||
set_selection(SOUND_TAB);
|
||||
//-----
|
||||
|
||||
if (flip_time_button_.pressed())
|
||||
set_flip_time(flip_time_button_.checked());
|
||||
|
||||
@ -617,6 +757,18 @@ void preferences_dialog::set_selection(int index)
|
||||
sound_button_.hide(hide_sound);
|
||||
sound_label_.hide(hide_sound);
|
||||
sound_slider_.hide(hide_sound);
|
||||
advanced_sound_button_.hide(hide_sound);
|
||||
|
||||
const bool hide_advanced_sound = tab_ != ADVANCED_SOUND_TAB;
|
||||
sample_rate_label_.hide(hide_advanced_sound);
|
||||
sample_rate_button1_.hide(hide_advanced_sound);
|
||||
sample_rate_button2_.hide(hide_advanced_sound);
|
||||
sample_rate_button3_.hide(hide_advanced_sound);
|
||||
sample_rate_input_.hide(hide_advanced_sound);
|
||||
confirm_sound_button_.hide(hide_advanced_sound);
|
||||
buffer_size_label_.hide(hide_advanced_sound);
|
||||
buffer_size_slider_.hide(hide_advanced_sound);
|
||||
normal_sound_button_.hide(hide_advanced_sound);
|
||||
|
||||
const bool hide_multiplayer = tab_ != MULTIPLAYER_TAB;
|
||||
chat_lines_label_.hide(hide_multiplayer);
|
||||
|
||||
@ -198,19 +198,13 @@ manager::~manager()
|
||||
}
|
||||
|
||||
bool init_sound() {
|
||||
//sounds don't sound good on Windows unless the buffer size is 4k,
|
||||
//but this seems to cause crashes on other systems...
|
||||
#ifdef WIN32
|
||||
const size_t buf_size = 4096;
|
||||
#else
|
||||
const size_t buf_size = 1024;
|
||||
#endif
|
||||
|
||||
if(SDL_WasInit(SDL_INIT_AUDIO) == 0)
|
||||
if(SDL_InitSubSystem(SDL_INIT_AUDIO) == -1)
|
||||
return false;
|
||||
|
||||
if(!mix_ok) {
|
||||
if(Mix_OpenAudio(preferences::sample_rate(), MIX_DEFAULT_FORMAT, 2, buf_size) == -1) {
|
||||
if(Mix_OpenAudio(preferences::sample_rate(), MIX_DEFAULT_FORMAT, 2, preferences::sound_buffer_size()) == -1) {
|
||||
mix_ok = false;
|
||||
ERR_AUDIO << "Could not initialize audio: " << Mix_GetError() << "\n";
|
||||
return false;
|
||||
@ -251,6 +245,19 @@ void close_sound() {
|
||||
LOG_AUDIO << "Audio device released.\n";
|
||||
}
|
||||
|
||||
void reset_sound() {
|
||||
bool music = preferences::music_on();
|
||||
bool sound = preferences::sound_on();
|
||||
if (music || sound) {
|
||||
sound::close_sound();
|
||||
sound::init_sound();
|
||||
if (!music)
|
||||
sound::stop_music();
|
||||
if (!sound)
|
||||
sound::stop_sound();
|
||||
}
|
||||
}
|
||||
|
||||
void stop_music() {
|
||||
if(mix_ok) {
|
||||
Mix_HaltMusic();
|
||||
|
||||
@ -26,6 +26,7 @@ struct manager {
|
||||
|
||||
bool init_sound();
|
||||
void close_sound();
|
||||
void reset_sound();
|
||||
|
||||
void stop_music();
|
||||
void stop_sound();
|
||||
|
||||
@ -183,7 +183,31 @@
|
||||
<codeCompletionDelay>250</codeCompletionDelay>
|
||||
<argumentsHintDelay>400</argumentsHintDelay>
|
||||
<headerCompletionDelay>250</headerCompletionDelay>
|
||||
<showOnlyAccessibleItems>false</showOnlyAccessibleItems>
|
||||
<completionBoxItemOrder>0</completionBoxItemOrder>
|
||||
<howEvaluationContextMenu>true</howEvaluationContextMenu>
|
||||
<showCommentWithArgumentHint>true</showCommentWithArgumentHint>
|
||||
<statusBarTypeEvaluation>false</statusBarTypeEvaluation>
|
||||
<namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
|
||||
<processPrimaryTypes>true</processPrimaryTypes>
|
||||
<processFunctionArguments>false</processFunctionArguments>
|
||||
<preProcessAllHeaders>false</preProcessAllHeaders>
|
||||
<parseMissingHeaders>false</parseMissingHeaders>
|
||||
<resolveIncludePaths>true</resolveIncludePaths>
|
||||
<alwaysParseInBackground>true</alwaysParseInBackground>
|
||||
<usePermanentCaching>true</usePermanentCaching>
|
||||
<alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
|
||||
<includePaths>.;</includePaths>
|
||||
</codecompletion>
|
||||
<qt>
|
||||
<used>false</used>
|
||||
<version>3</version>
|
||||
<includestyle>3</includestyle>
|
||||
<root></root>
|
||||
<designerintegration>EmbeddedKDevDesigner</designerintegration>
|
||||
<qmake>/usr/bin/qmake</qmake>
|
||||
<designer>/usr/bin/designer</designer>
|
||||
</qt>
|
||||
</kdevcppsupport>
|
||||
<cppsupportpart>
|
||||
<filetemplates>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user