yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Combine the various ogg_* commands into a single "ogg" cmd.

Browse source 
While here remove unecessary ogg_init and ogg_shutdown commands. And
some more cleanup.
This commit is contained in:
Yamagi Burmeister 2018-06-10 10:25:35 +02:00
parent 750b37f288
commit b586f84a3a
3 changed files with 143 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/client/sound/header/vorbis.h
View file

@ -25,13 +25,12 @@
#ifdef OGG
#ifndef CL_SOUND_VORBIS_H
#define CL_SOUND_VORBIS_H
#define CL_SOUND_VORBIS_H
/* The OGG codec can return the samples in a number
* of different formats, we use the standard signed
* short format. */
#define OGG_SAMPLEWIDTH 2
#define OGG_DIR "music"
#define OGG_SAMPLEWIDTH 2
typedef enum
{
@ -40,22 +39,14 @@ typedef enum
STOP
} ogg_status_t;
typedef enum
{
ABS,
REL
} ogg_seek_t;
void OGG_Init(void);
void OGG_PlayTrack(int track);
void OGG_Shutdown(void);
void OGG_Read(void);
void OGG_Stop(void);
void OGG_Stream(void);
void S_RawSamplesVol(int samples, int rate, int width,
int channels, byte *data, float volume);
/* Console commands. */
void OGG_ListCmd(void);
void OGG_PauseCmd(void);
void OGG_PlayCmd(void);
void OGG_PlayTrack(int track);

282
src/client/sound/ogg.c
View file

@ -64,77 +64,6 @@ enum GameType {
// --------
/*
* Initialize the Ogg Vorbis subsystem.
*/
void
OGG_Init(void)
{
cvar_t *ogg_enabled = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE);
if (ogg_enabled->value != 1)
{
return;
}
// Cvars
ogg_volume = Cvar_Get("ogg_volume", "0.7", CVAR_ARCHIVE);
ogg_ignoretrack0 = Cvar_Get("ogg_ignoretrack0", "0", CVAR_ARCHIVE);
// Commands
Cmd_AddCommand("ogg_list", OGG_ListCmd);
Cmd_AddCommand("ogg_pause", OGG_PauseCmd);
Cmd_AddCommand("ogg_play", OGG_PlayCmd);
Cmd_AddCommand("ogg_resume", OGG_ResumeCmd);
Cmd_AddCommand("ogg_status", OGG_StatusCmd);
Cmd_AddCommand("ogg_stop", OGG_Stop);
// Global bariables
ogg_curfile = -1;
ogg_info = NULL;
ogg_status = STOP;
ogg_started = true;
}
/*
* Shutdown the Ogg Vorbis subsystem.
*/
void
OGG_Shutdown(void)
{
if (!ogg_started)
{
return;
}
// Music must be stopped.
OGG_Stop();
// Free file lsit.
for(int i=0; i<MAX_NUM_OGGTRACKS; ++i)
{
if(oggTracks[i] != NULL)
{
free(oggTracks[i]);
oggTracks[i] = NULL;
}
}
oggMaxFileIndex = 0;
// Remove console commands
Cmd_RemoveCommand("ogg_list");
Cmd_RemoveCommand("ogg_pause");
Cmd_RemoveCommand("ogg_play");
Cmd_RemoveCommand("ogg_resume");
Cmd_RemoveCommand("ogg_status");
Cmd_RemoveCommand("ogg_stop");
ogg_started = false;
}
// --------
/*
* The GOG version of Quake2 has the music tracks in music/TrackXX.ogg
* That music/ dir is next to baseq/ (not in it) and contains Track02.ogg to Track21.ogg
@ -361,7 +290,7 @@ OGG_PlayTrack(int trackNo)
{
if(ogg_ignoretrack0->value == 0)
{
OGG_PauseCmd();
OGG_Stop();
return;
}
}
@ -448,6 +377,56 @@ OGG_PlayTrack(int trackNo)
// ----
/*
* List Ogg Vorbis files and print current playback state.
*/
void
OGG_Info(void)
{
Com_Printf("Tracks:\n");
int numFiles = 0;
for (int i = 2; i <= oggMaxFileIndex; i++)
{
if(oggTracks[i])
{
Com_Printf(" - %02d %s\n", i, oggTracks[i]);
++numFiles;
}
else
{
Com_Printf(" - %02d <none>\n", i);
}
}
Com_Printf("Total: %d Ogg/Vorbis files.\n", oggMaxFileIndex+1);
switch (ogg_status)
{
case PLAY:
Com_Printf("State: Playing file %d (%s) at %0.2f seconds.\n",
ogg_curfile, oggTracks[ogg_curfile], ov_time_tell(&ovFile));
break;
case PAUSE:
Com_Printf("State: Paused file %d (%s) at %0.2f seconds.\n",
ogg_curfile, oggTracks[ogg_curfile], ov_time_tell(&ovFile));
break;
case STOP:
if (ogg_curfile == -1)
{
Com_Printf("State: Stopped.\n");
}
else
{
Com_Printf("State: Stopped file %d (%s).\n", ogg_curfile, oggTracks[ogg_curfile]);
}
break;
}
}
/*
* Stop playing the current file.
*/
@ -473,124 +452,143 @@ OGG_Stop(void)
}
/*
* List Ogg Vorbis files.
* Pause or resume playback.
*/
void
OGG_ListCmd(void)
{
int numFiles = 0;
for (int i = 2; i <= oggMaxFileIndex; i++)
{
if(oggTracks[i])
{
Com_Printf("%d %s\n", i, oggTracks[i]);
++numFiles;
}
else
{
Com_Printf("%d <none>\n", i);
}
}
Com_Printf("%d Ogg Vorbis files.\n", oggMaxFileIndex+1);
}
/*
* Pause current song.
*/
void
OGG_PauseCmd(void)
OGG_TogglePlayback(void)
{
if (ogg_status == PLAY)
{
ogg_status = PAUSE;
ogg_numbufs = 0;
}
#ifdef USE_OPENAL
if (sound_started == SS_OAL)
{
AL_UnqueueRawSamples();
}
if (sound_started == SS_OAL)
{
AL_UnqueueRawSamples();
}
#endif
}
else if (ogg_status == PAUSE)
{
ogg_status = PLAY;
}
}
/*
* Play control.
* The 'ogg' cmd. Gives some control and information about the playback state.
*/
void
OGG_PlayCmd(void)
OGG_Cmd(void)
{
if (Cmd_Argc() < 1)
if (Cmd_Argc() < 2)
{
Com_Printf("Usage: ogg_play [n]\n");
Com_Printf("ogg <command> : Control Ogg/Vorbis playback\n");
return;
}
if (Cmd_Argc() > 1)
if (Q_stricmp(Cmd_Argv(1), "info") == 0)
{
int track = atoi(Cmd_Argv(1));
OGG_Info();
}
else if (Q_stricmp(Cmd_Argv(1), "play") == 0)
{
if (Cmd_Argc() != 3)
{
Com_Printf("ogg play <track> : Play <track>");
return;
}
int track = (int)strtol(Cmd_Argv(2), NULL, 10);
if (track < 2 || track > oggMaxFileIndex)
{
Com_Printf("invalid track %s, must be an number between 2 and %d\n", Cmd_Argv(1), oggMaxFileIndex);
return;
}
else
{
OGG_PlayTrack(track);
}
}
else if (ogg_status == PAUSE) // ogg_play without an argument means resume
else if (Q_stricmp(Cmd_Argv(1), "stop") == 0)
{
ogg_status = PLAY;
OGG_Stop();
}
else if (Q_stricmp(Cmd_Argv(1), "toggle") == 0)
{
OGG_TogglePlayback();
}
else
{
Com_Printf("Unknown sub command %s\n\n", Cmd_Argv(1));
Com_Printf("Commands:\n");
Com_Printf(" - info: Print informations about playback state and tracks\n");
Com_Printf(" - play <track>: Play track number <track>\n");
Com_Printf(" - stop: Stop playback\n");
Com_Printf(" - toggle: Toggle pause\n");
}
}
// --------
/*
* Resume current song.
* Initialize the Ogg Vorbis subsystem.
*/
void
OGG_ResumeCmd(void) // TODO: OGG_TogglePlay?
OGG_Init(void)
{
if (ogg_status == PAUSE)
cvar_t *ogg_enabled = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE);
if (ogg_enabled->value != 1)
{
ogg_status = PLAY;
return;
}
// Cvars
ogg_volume = Cvar_Get("ogg_volume", "0.7", CVAR_ARCHIVE);
ogg_ignoretrack0 = Cvar_Get("ogg_ignoretrack0", "0", CVAR_ARCHIVE);
// Commands
Cmd_AddCommand("ogg", OGG_Cmd);
// Global bariables
ogg_curfile = -1;
ogg_info = NULL;
ogg_status = STOP;
ogg_started = true;
}
/*
* Display status.
* Shutdown the Ogg Vorbis subsystem.
*/
void
OGG_StatusCmd(void)
OGG_Shutdown(void)
{
switch (ogg_status)
if (!ogg_started)
{
case PLAY:
Com_Printf("Playing file %d (%s) at %0.2f seconds.\n",
ogg_curfile, oggTracks[ogg_curfile],
ov_time_tell(&ovFile));
break;
case PAUSE:
Com_Printf("Paused file %d (%s) at %0.2f seconds.\n",
ogg_curfile, oggTracks[ogg_curfile],
ov_time_tell(&ovFile));
break;
case STOP:
if (ogg_curfile == -1)
{
Com_Printf("Stopped.\n");
}
else
{
Com_Printf("Stopped file %d (%s).\n",
ogg_curfile, oggTracks[ogg_curfile]);
}
break;
return;
}
// Music must be stopped.
OGG_Stop();
// Free file lsit.
for(int i=0; i<MAX_NUM_OGGTRACKS; ++i)
{
if(oggTracks[i] != NULL)
{
free(oggTracks[i]);
oggTracks[i] = NULL;
}
}
oggMaxFileIndex = 0;
// Remove console commands
Cmd_RemoveCommand("ogg");
ogg_started = false;
}
#endif /* OGG */

8
src/client/sound/sound.c
View file

@ -1059,10 +1059,6 @@ S_Init(void)
Cmd_AddCommand("stopsound", S_StopAllSounds);
Cmd_AddCommand("soundlist", S_SoundList);
Cmd_AddCommand("soundinfo", S_SoundInfo_f);
#ifdef OGG
Cmd_AddCommand("ogg_init", OGG_Init);
Cmd_AddCommand("ogg_shutdown", OGG_Shutdown);
#endif
#if USE_OPENAL
cv = Cvar_Get("s_openal", "1", CVAR_ARCHIVE);
@ -1169,9 +1165,5 @@ S_Shutdown(void)
Cmd_RemoveCommand("soundinfo");
Cmd_RemoveCommand("play");
Cmd_RemoveCommand("stopsound");
#ifdef OGG
Cmd_RemoveCommand("ogg_init");
Cmd_RemoveCommand("ogg_shutdown");
#endif
}