--- hatari/src/gui-sdl/dlgSound.c 2019/04/01 07:13:51 1.1.1.4 +++ hatari/src/gui-sdl/dlgSound.c 2019/04/09 08:52:15 1.1.1.11 @@ -4,7 +4,7 @@ This file is distributed under the GNU Public License, version 2 or at your option any later version. Read the file gpl.txt for details. */ -const char DlgSound_rcsid[] = "Hatari $Id: dlgSound.c,v 1.1.1.4 2019/04/01 07:13:51 root Exp $"; +const char DlgSound_fileid[] = "Hatari dlgSound.c : " __DATE__ " " __TIME__; #include "main.h" #include "configuration.h" @@ -15,13 +15,23 @@ const char DlgSound_rcsid[] = "Hatari $I #define DLGSOUND_ENABLE 3 -#define DLGSOUND_LOW 5 -#define DLGSOUND_MEDIUM 6 -#define DLGSOUND_HIGH 7 -#define DLGSOUND_RECNAME 11 -#define DLGSOUND_RECBROWSE 12 -#define DLGSOUND_RECORD 13 -#define DLGSOUND_EXIT 14 +#define DLGSOUND_SYNC 4 +#define DLGSOUND_11KHZ 6 +#define DLGSOUND_12KHZ 7 +#define DLGSOUND_16KHZ 8 +#define DLGSOUND_22KHZ 9 +#define DLGSOUND_25KHZ 10 +#define DLGSOUND_32KHZ 11 +#define DLGSOUND_44KHZ 12 +#define DLGSOUND_48KHZ 13 +#define DLGSOUND_50KHZ 14 +#define DLGSOUND_MODEL 16 +#define DLGSOUND_TABLE 17 +#define DLGSOUND_LINEAR 18 +#define DLGSOUND_RECNAME 22 +#define DLGSOUND_RECBROWSE 23 +#define DLGSOUND_RECORD 24 +#define DLGSOUND_EXIT 25 static char dlgRecordName[35]; @@ -30,53 +40,100 @@ static char dlgRecordName[35]; /* The sound dialog: */ static SGOBJ sounddlg[] = { - { SGBOX, 0, 0, 0,0, 38,24, NULL }, - { SGBOX, 0, 0, 1,1, 36,11, NULL }, - { SGTEXT, 0, 0, 13,2, 13,1, "Sound options" }, - { SGCHECKBOX, 0, 0, 12,4, 14,1, "Enable sound" }, - { SGTEXT, 0, 0, 11,6, 14,1, "Playback quality:" }, - { SGRADIOBUT, 0, 0, 12,8, 15,1, "Low (11kHz)" }, - { SGRADIOBUT, 0, 0, 12,9, 19,1, "Medium (22kHz)" }, - { SGRADIOBUT, 0, 0, 12,10, 14,1, "High (44kHz)" }, - { SGBOX, 0, 0, 1,13, 36,8, NULL }, - { SGTEXT, 0, 0, 13,14, 14,1, "Capture YM/WAV" }, - { SGTEXT, 0, 0, 2,16, 26,1, "File name (*.wav or *.ym):" }, - { SGTEXT, 0, 0, 2,17, 34,1, dlgRecordName }, - { SGBUTTON, 0, 0, 30,16, 6,1, "Browse" }, - { SGBUTTON, 0, 0, 12,19, 16,1, NULL }, - { SGBUTTON, SG_DEFAULT, 0, 10,22, 20,1, "Back to main menu" }, + { SGBOX, 0,0, 0, 0, 40,25, NULL }, + { SGBOX, 0,0, 1, 1, 38,13, NULL }, + { SGTEXT, 0,0, 4, 2, 13,1, "SOUND" }, + { SGCHECKBOX, 0,0, 13, 2, 14,1, "Enabled" }, + { SGCHECKBOX, 0,0, 25, 2, 14,1, "Synchronize" }, + + { SGTEXT, 0,0, 4, 4, 14,1, "Playback quality:" }, + { SGRADIOBUT, 0,0, 2, 6, 10,1, "11025 Hz" }, + { SGRADIOBUT, 0,0, 2, 7, 10,1, "12517 Hz" }, + { SGRADIOBUT, 0,0, 2, 8, 10,1, "16000 Hz" }, + { SGRADIOBUT, 0,0, 15, 6, 10,1, "22050 Hz" }, + { SGRADIOBUT, 0,0, 15, 7, 10,1, "25033 Hz" }, + { SGRADIOBUT, 0,0, 15, 8, 10,1, "32000 Hz" }, + { SGRADIOBUT, 0,0, 28, 6, 10,1, "44100 Hz" }, + { SGRADIOBUT, 0,0, 28, 7, 10,1, "48000 Hz" }, + { SGRADIOBUT, 0,0, 28, 8, 10,1, "50066 Hz" }, + + { SGTEXT, 0,0, 4,10, 10,1, "YM voices mixing:" }, + { SGRADIOBUT, 0,0, 2,12, 10,1, "Math model" }, + { SGRADIOBUT, 0,0, 15,12, 10,1, "ST table" }, + { SGRADIOBUT, 0,0, 28,12, 10,1, "Linear" }, + + { SGBOX, 0,0, 1,15, 38,7, NULL }, + { SGTEXT, 0,0, 13,16, 14,1, "Capture YM/WAV" }, + { SGTEXT, 0,0, 2,17, 26,1, "File name (*.wav / *.ym):" }, + { SGTEXT, 0,0, 2,18, 34,1, dlgRecordName }, + { SGBUTTON, 0,0, 28,17, 8,1, " Browse " }, + { SGBUTTON, 0,0, 12,20, 16,1, NULL }, + { SGBUTTON, SG_DEFAULT, 0, 10,23, 20,1, "Back to main menu" }, { -1, 0, 0, 0,0, 0,0, NULL } }; +static const int nSoundFreqs[] = +{ + 11025, + 12517, + 16000, + 22050, + 25033, + 32000, + 44100, + 48000, + 50066 +}; + + /*-----------------------------------------------------------------------*/ -/* - Show and process the sound dialog. -*/ +/** + * Show and process the sound dialog. + */ void Dialog_SoundDlg(void) { - int but; + int but, i; SDLGui_CenterDlg(sounddlg); /* Set up dialog from actual values: */ - if (DialogParams.Sound.bEnableSound) + if (ConfigureParams.Sound.bEnableSound) sounddlg[DLGSOUND_ENABLE].state |= SG_SELECTED; else sounddlg[DLGSOUND_ENABLE].state &= ~SG_SELECTED; - sounddlg[DLGSOUND_LOW].state &= ~SG_SELECTED; - sounddlg[DLGSOUND_MEDIUM].state &= ~SG_SELECTED; - sounddlg[DLGSOUND_HIGH].state &= ~SG_SELECTED; - if (DialogParams.Sound.nPlaybackQuality == PLAYBACK_LOW) - sounddlg[DLGSOUND_LOW].state |= SG_SELECTED; - else if (DialogParams.Sound.nPlaybackQuality == PLAYBACK_MEDIUM) - sounddlg[DLGSOUND_MEDIUM].state |= SG_SELECTED; + if (ConfigureParams.Sound.bEnableSoundSync) + sounddlg[DLGSOUND_SYNC].state |= SG_SELECTED; + else + sounddlg[DLGSOUND_SYNC].state &= ~SG_SELECTED; + + for (i = DLGSOUND_11KHZ; i <= DLGSOUND_50KHZ; i++) + sounddlg[i].state &= ~SG_SELECTED; + + for (i = 0; i <= DLGSOUND_50KHZ-DLGSOUND_11KHZ; i++) + { + if (ConfigureParams.Sound.nPlaybackFreq > nSoundFreqs[i]-500 + && ConfigureParams.Sound.nPlaybackFreq < nSoundFreqs[i]+500) + { + sounddlg[DLGSOUND_11KHZ + i].state |= SG_SELECTED; + break; + } + } + + sounddlg[DLGSOUND_MODEL].state &= ~SG_SELECTED; + sounddlg[DLGSOUND_TABLE].state &= ~SG_SELECTED; + sounddlg[DLGSOUND_LINEAR].state &= ~SG_SELECTED; + if (ConfigureParams.Sound.YmVolumeMixing == YM_MODEL_MIXING) + sounddlg[DLGSOUND_MODEL].state |= SG_SELECTED; + else + if (ConfigureParams.Sound.YmVolumeMixing == YM_TABLE_MIXING) + sounddlg[DLGSOUND_TABLE].state |= SG_SELECTED; else - sounddlg[DLGSOUND_HIGH].state |= SG_SELECTED; + sounddlg[DLGSOUND_LINEAR].state |= SG_SELECTED; - File_ShrinkName(dlgRecordName, DialogParams.Sound.szYMCaptureFileName, sounddlg[DLGSOUND_RECNAME].w); + File_ShrinkName(dlgRecordName, ConfigureParams.Sound.szYMCaptureFileName, sounddlg[DLGSOUND_RECNAME].w); if ( Sound_AreWeRecording() ) sounddlg[DLGSOUND_RECORD].txt = "Stop recording"; @@ -91,9 +148,9 @@ void Dialog_SoundDlg(void) { case DLGSOUND_RECBROWSE: /* Choose a new record file */ SDLGui_FileConfSelect(dlgRecordName, - DialogParams.Sound.szYMCaptureFileName, + ConfigureParams.Sound.szYMCaptureFileName, sounddlg[DLGSOUND_RECNAME].w, - TRUE); + true); break; case DLGSOUND_RECORD: if (Sound_AreWeRecording()) @@ -104,12 +161,12 @@ void Dialog_SoundDlg(void) else { /* make sure that we have a valid file name... */ - if (strlen(DialogParams.Sound.szYMCaptureFileName) < 4) + if (strlen(ConfigureParams.Sound.szYMCaptureFileName) < 4) { - strcpy(DialogParams.Sound.szYMCaptureFileName, "./hatari.wav"); + strcpy(ConfigureParams.Sound.szYMCaptureFileName, "./hatari.wav"); } sounddlg[DLGSOUND_RECORD].txt = "Stop recording"; - Sound_BeginRecording(DialogParams.Sound.szYMCaptureFileName); + Sound_BeginRecording(ConfigureParams.Sound.szYMCaptureFileName); } break; } @@ -118,11 +175,24 @@ void Dialog_SoundDlg(void) && but != SDLGUI_ERROR && !bQuitProgram ); /* Read values from dialog */ - DialogParams.Sound.bEnableSound = (sounddlg[DLGSOUND_ENABLE].state & SG_SELECTED); - if (sounddlg[DLGSOUND_LOW].state & SG_SELECTED) - DialogParams.Sound.nPlaybackQuality = PLAYBACK_LOW; - else if (sounddlg[DLGSOUND_MEDIUM].state & SG_SELECTED) - DialogParams.Sound.nPlaybackQuality = PLAYBACK_MEDIUM; + ConfigureParams.Sound.bEnableSound = (sounddlg[DLGSOUND_ENABLE].state & SG_SELECTED); + + ConfigureParams.Sound.bEnableSoundSync = (sounddlg[DLGSOUND_SYNC].state & SG_SELECTED); + + for (i = DLGSOUND_11KHZ; i <= DLGSOUND_50KHZ; i++) + { + if (sounddlg[i].state & SG_SELECTED) + { + ConfigureParams.Sound.nPlaybackFreq = nSoundFreqs[i-DLGSOUND_11KHZ]; + break; + } + } + + if (sounddlg[DLGSOUND_MODEL].state & SG_SELECTED) + ConfigureParams.Sound.YmVolumeMixing = YM_MODEL_MIXING; + else + if (sounddlg[DLGSOUND_TABLE].state & SG_SELECTED) + ConfigureParams.Sound.YmVolumeMixing = YM_TABLE_MIXING; else - DialogParams.Sound.nPlaybackQuality = PLAYBACK_HIGH; + ConfigureParams.Sound.YmVolumeMixing = YM_LINEAR_MIXING; }