Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert music to use new logging facility

Browse Source
This commit is contained in:
Azamat H. Hackimov 2024-08-20 03:14:06 +03:00
parent b9de85791d
commit ffdbc8b621
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
music/CMakeLists.txt
View File

@ -16,6 +16,7 @@ target_link_libraries(music
misc
sndlib
stream_audio
plog::plog
)
target_include_directories(music PUBLIC
$<BUILD_INTERFACE:

15
music/omflex.cpp
View File

@ -71,6 +71,7 @@
* $NoKeywords: $
*/
#include "log.h"
#include "music.h"
#include "musiclib.h"
#include "inffile.h"
@ -148,7 +149,7 @@ bool OutrageMusicSeq::LoadTheme(const char *file) {
return false;
if (!inf.Open(file, "[theme file]", OMFLex)) {
mprintf(0, "Unable to find requested theme %s or bad file.\n", file);
LOG_WARNING.printf("Unable to find requested theme %s or bad file.", file);
return false;
}
@ -210,10 +211,10 @@ bool OutrageMusicSeq::LoadTheme(const char *file) {
}
force_pre_error:
if (cmd == INFFILE_ERROR) {
mprintf(0, "Error in music file %s line %d.\n", file, inf.line());
LOG_ERROR.printf("Error in music file %s line %d.", file, inf.line());
Int3();
} else if (cmd == OMFFILEERR_LBLOVERFLOW) {
mprintf(0, "Error in music file %s line %d (too many labels).\n", file, inf.line());
LOG_ERROR.printf("Error in music file %s line %d (too many labels).", file, inf.line());
Int3();
}
}
@ -222,7 +223,7 @@ bool OutrageMusicSeq::LoadTheme(const char *file) {
// reopen for SECOND PASS (actual code read)
if (!inf.Open(file, "[theme file]", OMFLex)) {
mprintf(0, "Unable to find requested theme %s or bad file.\n", file);
LOG_WARNING.printf("Unable to find requested theme %s or bad file.", file);
return false;
}
@ -357,13 +358,13 @@ bool OutrageMusicSeq::LoadTheme(const char *file) {
force_error:
if (cmd == INFFILE_ERROR) {
mprintf(0, "Error in music file %s line %d.\n", file, inf.line());
LOG_ERROR.printf("Error in music file %s line %d.", file, inf.line());
Int3();
} else if (cmd == OMFFILEERR_ADDSECTION) {
mprintf(0, "Error in music file %s line %d (failed to add section).\n", file, inf.line());
LOG_ERROR.printf("Error in music file %s line %d (failed to add section).", file, inf.line());
Int3();
} else if (cmd == OMFFILEERR_INSOVERFLOW) {
mprintf(0, "Error in music file %s line %d (too many instructions).\n", file, inf.line());
LOG_ERROR.printf("Error in music file %s line %d (too many instructions).", file, inf.line());
Int3();
}
}

29
music/sequencer.cpp
View File

@ -147,14 +147,13 @@
#include "ddio.h"
#include "inffile.h"
#include "log.h"
#include "mem.h"
#include "music.h"
#include "musiclib.h"
#include "pserror.h"
#include "streamaudio.h"
#define LOGFILE(_s)
OutrageMusicSeq::OutrageMusicSeq() {
m_sequencer_run = false;
m_sequencer_init = false;
@ -236,7 +235,7 @@ void OutrageMusicSeq::Start() {
m_registers[i] = 0;
}
mprintf(0, "Music system on.\n");
LOG_INFO << "Music system on.";
}
// stops the sequencer, flushes events
@ -246,7 +245,7 @@ void OutrageMusicSeq::Stop() {
int i;
mprintf(0, "Music system off.\n");
LOG_INFO << "Music system off.";
m_sequencer_run = false;
for (i = 0; i < OMS_NUM_STRM; i++) {
@ -317,8 +316,7 @@ void OutrageMusicSeq::Frame(float frame_time) {
}
if (start_pending_song) {
mprintf(0, "MUSIC:Starting pending song.\n");
LOGFILE((_logfp, "MUSIC:Starting pending song.\n"));
LOG_INFO << "Starting pending song.";
START_PENDING_SONG();
}
@ -381,14 +379,14 @@ next_ins:
stream->Close();
m_dominant_strm = DOMINANT_STRM_ADJUST();
// mprintf(0, "MUSIC: Starting stream with %s on channel %d.\n", name, m_dominant_strm);
LOGFILE((_logfp, "MUSIC: Starting stream with %s on channel %d.\n", name, m_dominant_strm));
LOG_INFO.printf("Starting stream with %s on channel %d.", name, m_dominant_strm);
strm->strm = &m_strm[m_dominant_strm];
stream = &strm->strm->m_stream;
err = stream->Open(name);
} else {
m_dominant_strm = DOMINANT_STRM_ADJUST();
// mprintf(0, "MUSIC: Preparing stream with %s on channel %d.\n", name, m_dominant_strm);
LOGFILE((_logfp, "MUSIC: Preparing stream with %s on channel %d.\n", name, m_dominant_strm));
LOG_INFO.printf("Preparing stream with %s on channel %d.", name, m_dominant_strm);
strm->strm = &m_strm[m_dominant_strm];
stream = &strm->strm->m_stream;
err = stream->Open(name);
@ -398,7 +396,7 @@ next_ins:
// skip instructions until error is cleared.
if (!err) {
// mprintf(0, "MUSIC: Error opening stream %s on channel %d.\n", name, m_dominant_strm);
LOGFILE((_logfp, "MUSIC: Error opening stream %s on channel %d.\n", name, m_dominant_strm));
LOG_WARNING.printf("Error opening stream %s on channel %d.", name, m_dominant_strm);
strm->error = true;
}
@ -406,7 +404,7 @@ next_ins:
stream->SetVolume(m_mastervol);
strm->stream_idle = false;
} else {
mprintf(0, "OMS: Stream was not found in track list.\n");
LOG_WARNING << "OMS: Stream was not found in track list.";
}
strm->pending_loop_name = name;
@ -432,12 +430,10 @@ next_ins:
}
if (!strm->error) {
// mprintf(0, "MUSIC: playing %s.\n", strm->loop_name);
LOGFILE((_logfp, "MUSIC: playing %s.\n", strm->loop_name));
LOGFILE((_logfp, "MUSIC: state of played stream is %d.\n", strm->loop_name, stream->State()));
LOG_INFO.printf("Playing %s.", strm->loop_name);
LOG_INFO.printf("State of played stream is %d.", strm->loop_name, stream->State());
} else {
// mprintf(0, "MUSIC: Error playing %s.\n", strm->loop_name);
LOGFILE((_logfp, "MUSIC: Error playing %s.\n", strm->loop_name));
LOG_WARNING.printf("Error playing %s.", strm->loop_name);
}
break;
@ -536,8 +532,7 @@ next_ins:
if (strm->request_stop) {
strm->stream_idle = true;
strm->request_stop = false;
mprintf(0, "MUSIC: Processed stop request.\n");
LOGFILE((_logfp, "MUSIC: Processed stop request.\n"));
LOG_INFO << "Processed stop request.";
}
}
break;

5
music/streamer.cpp
View File

@ -60,6 +60,7 @@
* $NoKeywords: $
*/
#include "log.h"
#include "music.h"
#include "streamaudio.h"
@ -125,7 +126,7 @@ void oms_stream::Process(float frmtime) {
case OMS_STRM_SWITCH:
STREAM_COMMANDP(OMS_STRM_SWITCH, evt.parm.p);
m_stream.Stop(true, &m_data.i);
mprintf(0, "%d-%d ", m_data.i, m_stream.State());
LOG_DEBUG.printf("%d-%d", m_data.i, m_stream.State());
break;
case OMS_STRM_NEXT:
@ -243,7 +244,7 @@ void oms_stream::processQLoad(const char *fname) {
STREAM_COMMANDP(OMS_STRM_LOAD, (void *)fname);
m_data.p = (void *)fname;
} else {
mprintf(0, "OMS: Couldn't load song %s.\n", fname);
LOG_WARNING.printf("OMS: Couldn't load song %s.", fname);
STREAM_COMMANDI(OMS_STRM_FREE);
m_valid_result = true;