Skip to content

Add volume setting to ini #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add volume setting to ini #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35c2fc2
Add (mixer) volume setting
dagit Mar 17, 2023
7ea7f75
Set default volume to 100
dagit Mar 17, 2023
6d4386e
Clean up audio setting code a bit
dagit Mar 17, 2023
19f231a
Store mixer volume in the range 0 to 100 internally
dagit Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sm.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ LinearFiltering = 0
[Sound]
EnableAudio = 1

# Default mixer volume
Volume = 100

# DSP frequency in samples per second (e.g. 48000, 44100, 32000, 22050, 11025)
AudioFreq = 32000

Expand Down
3 changes: 3 additions & 0 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@ static bool HandleIniConfig(int section, const char *key, char *value) {
return true;
} else if (StringEqualsNoCase(key, "ResumeMSU")) {
return ParseBool(value, &g_config.resume_msu);
} else if (StringEqualsNoCase(key, "Volume")) {
g_config.volume = (uint8)strtol(value, (char**)NULL, 10);
return true;
}
} else if (section == 3) {
if (StringEqualsNoCase(key, "Autosave")) {
Expand Down
1 change: 1 addition & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef struct Config {
uint8 enable_msu;
bool resume_msu;
bool disable_frame_delay;
uint8 volume;
uint8 msuvolume;
uint32 features0;

Expand Down
37 changes: 27 additions & 10 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ static void SDLCALL AudioCallback(void *userdata, Uint8 *stream, int len);
static void SwitchDirectory();
static void RenderNumber(uint8 *dst, size_t pitch, int n, uint8 big);
static void OpenOneGamepad(int i);
static void SetVolumeLevel(int new_volume);
static int GetVolumeLevel();
static void HandleVolumeAdjustment(int volume_adjustment);
static void HandleGamepadAxisInput(int gamepad_id, int axis, int value);
static int RemapSdlButton(int button);
Expand Down Expand Up @@ -76,7 +78,8 @@ static bool g_display_perf;
static int g_curr_fps;
static int g_ppu_render_flags = 0;
static int g_snes_width, g_snes_height;
static int g_sdl_audio_mixer_volume = SDL_MIX_MAXVOLUME;
static const int MIX_MAXVOLUME = 100;
static int g_audio_mixer_volume = MIX_MAXVOLUME;
static struct RendererFuncs g_renderer_funcs;
static uint32 g_gamepad_modifiers;
static uint16 g_gamepad_last_cmd[kGamepadBtn_Count];
Expand Down Expand Up @@ -222,11 +225,12 @@ static void SDLCALL AudioCallback(void *userdata, Uint8 *stream, int len) {
g_audiobuffer_end = g_audiobuffer + g_frames_per_block * g_audio_channels * sizeof(int16);
}
int n = IntMin(len, g_audiobuffer_end - g_audiobuffer_cur);
if (g_sdl_audio_mixer_volume == SDL_MIX_MAXVOLUME) {
if (g_audio_mixer_volume == MIX_MAXVOLUME) {
memcpy(stream, g_audiobuffer_cur, n);
} else {
SDL_memset(stream, 0, n);
SDL_MixAudioFormat(stream, g_audiobuffer_cur, AUDIO_S16, n, g_sdl_audio_mixer_volume);
const int current_volume = IntMin(IntMax(0, (SDL_MIX_MAXVOLUME*g_audio_mixer_volume)/MIX_MAXVOLUME), SDL_MIX_MAXVOLUME);
SDL_MixAudioFormat(stream, g_audiobuffer_cur, AUDIO_S16, n, current_volume);
}
g_audiobuffer_cur += n;
stream += n;
Expand Down Expand Up @@ -357,6 +361,9 @@ int main(int argc, char** argv) {
if (g_config.audio_samples <= 0 || ((g_config.audio_samples & (g_config.audio_samples - 1)) != 0))
g_config.audio_samples = kDefaultSamples;

// Load the volume level from the config file
SetVolumeLevel(g_config.volume);

// set up SDL
if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_GAMECONTROLLER) != 0) {
printf("Failed to init SDL: %s\n", SDL_GetError());
Expand Down Expand Up @@ -733,18 +740,28 @@ static void HandleGamepadInput(int button, bool pressed) {
HandleCommand(g_gamepad_last_cmd[button], pressed);
}

static void HandleVolumeAdjustment(int volume_adjustment) {
static int GetVolumeLevel() {
#if SYSTEM_VOLUME_MIXER_AVAILABLE
int current_volume = GetApplicationVolume();
int new_volume = IntMin(IntMax(0, current_volume + volume_adjustment * 5), 100);
SetApplicationVolume(new_volume);
printf("[System Volume]=%i\n", new_volume);
return GetApplicationVolume();
#else
g_sdl_audio_mixer_volume = IntMin(IntMax(0, g_sdl_audio_mixer_volume + volume_adjustment * (SDL_MIX_MAXVOLUME >> 4)), SDL_MIX_MAXVOLUME);
printf("[SDL mixer volume]=%i\n", g_sdl_audio_mixer_volume);
return g_audio_mixer_volume;
#endif
}

static void SetVolumeLevel(int new_volume) {
g_audio_mixer_volume = IntMin(IntMax(0, new_volume), MIX_MAXVOLUME);
#if SYSTEM_VOLUME_MIXER_AVAILABLE
SetApplicationVolume(g_audio_mixer_volume);
#endif
printf("[Mixer Volume]=%i\n", g_audio_mixer_volume);
}

static void HandleVolumeAdjustment(int volume_adjustment) {
int current_volume = GetVolumeLevel();
int new_volume = current_volume + volume_adjustment * 5;
SetVolumeLevel(new_volume);
}

// Approximates atan2(y, x) normalized to the [0,4) range
// with a maximum error of 0.1620 degrees
// normalized_atan(x) ~ (b x + x^2) / (1 + 2 b x + x^2)
Expand Down