diff options
| author | kcgen <kcgen@users.noreply.github.com> | 2022-11-10 06:01:00 +0300 |
|---|---|---|
| committer | kcgen <1557255+kcgen@users.noreply.github.com> | 2022-11-10 06:10:21 +0300 |
| commit | 8dae2ba60860d4817d04c46703a32e0358790c6c (patch) | |
| tree | 7fd0fa4c0be0a3f4166518f2a3c2892333259df7 | |
| parent | bb5025d4c1f2f9b013a3b0704f8585cdf3fc7518 (diff) | |
Normalize the capture file opener function name
This uses the standard "MODULE_CamelCase" for the previous
non-standard OpenCaptureFile(...) function.
| -rw-r--r-- | include/hardware.h | 2 | ||||
| -rw-r--r-- | src/hardware/hardware.cpp | 10 | ||||
| -rw-r--r-- | src/hardware/opl.cpp | 4 | ||||
| -rw-r--r-- | src/hardware/serialport/serialport.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/hardware.h b/include/hardware.h index 9a09fb4bc..9199b2f37 100644 --- a/include/hardware.h +++ b/include/hardware.h @@ -48,7 +48,7 @@ bool TS_Get_Address(Bitu& tsaddr, Bitu& tsirq, Bitu& tsdma); extern uint8_t adlib_commandreg; std::string CAPTURE_GetScreenshotFilename(const char *type, const char *ext); -FILE *OpenCaptureFile(const char *type, const char *ext); +FILE *CAPTURE_OpenFile(const char *type, const char *ext); void CAPTURE_AddWave(uint32_t freq, uint32_t len, int16_t * data); diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp index db8b9ec0f..30f87ec3b 100644 --- a/src/hardware/hardware.cpp +++ b/src/hardware/hardware.cpp @@ -143,7 +143,7 @@ std::string CAPTURE_GetScreenshotFilename(const char *type, const char *ext) return file_name; } -FILE *OpenCaptureFile(const char *type, const char *ext) +FILE *CAPTURE_OpenFile(const char *type, const char *ext) { const auto file_name = CAPTURE_GetScreenshotFilename(type, ext); FILE *handle = fopen(file_name.c_str(), "wb"); @@ -375,7 +375,7 @@ void CAPTURE_AddImage([[maybe_unused]] int width, CaptureState &= ~CAPTURE_IMAGE; /* Open the actual file */ - FILE *fp = OpenCaptureFile("Screenshot", ".png"); + FILE *fp = CAPTURE_OpenFile("Screenshot", ".png"); if (!fp) goto skip_shot; /* First try to allocate the png structures */ @@ -550,7 +550,7 @@ skip_shot: default: goto skip_video; } if (!capture.video.handle) { - capture.video.handle = OpenCaptureFile("Video",".avi"); + capture.video.handle = CAPTURE_OpenFile("Video",".avi"); if (!capture.video.handle) goto skip_video; capture.video.codec = new VideoCodec(); @@ -683,7 +683,7 @@ void CAPTURE_AddWave(uint32_t freq, uint32_t len, int16_t * data) { #endif if (CaptureState & CAPTURE_WAVE) { if (!capture.wave.handle) { - capture.wave.handle=OpenCaptureFile("Wave Output",".wav"); + capture.wave.handle=CAPTURE_OpenFile("Wave Output",".wav"); if (!capture.wave.handle) { CaptureState &= ~CAPTURE_WAVE; return; @@ -767,7 +767,7 @@ static void RawMidiAddNumber(uint32_t val) { void CAPTURE_AddMidi(bool sysex, Bitu len, uint8_t * data) { if (!capture.midi.handle) { - capture.midi.handle=OpenCaptureFile("Raw Midi",".mid"); + capture.midi.handle=CAPTURE_OpenFile("Raw Midi",".mid"); if (!capture.midi.handle) { return; } diff --git a/src/hardware/opl.cpp b/src/hardware/opl.cpp index e3c4a8389..41c8d8aff 100644 --- a/src/hardware/opl.cpp +++ b/src/hardware/opl.cpp @@ -196,7 +196,7 @@ public: if (!(note_on || percussion_on)) return true; - handle = OpenCaptureFile("Raw Opl", ".dro"); + handle = CAPTURE_OpenFile("Raw Opl", ".dro"); if (!handle) return false; @@ -793,7 +793,7 @@ static void SaveRad() char b[16 * 1024]; int w = 0; - FILE *handle = OpenCaptureFile("RAD Capture", ".rad"); + FILE *handle = CAPTURE_OpenFile("RAD Capture", ".rad"); if (!handle) return; diff --git a/src/hardware/serialport/serialport.cpp b/src/hardware/serialport/serialport.cpp index 2e55c32b7..aab0d3332 100644 --- a/src/hardware/serialport/serialport.cpp +++ b/src/hardware/serialport/serialport.cpp @@ -1145,7 +1145,7 @@ CSerial::CSerial(const uint8_t port_idx, CommandLine *cmd) if(dbg_serialtraffic|dbg_modemcontrol|dbg_register|dbg_interrupt|dbg_aux) - debugfp=OpenCaptureFile("serlog",".serlog.txt"); + debugfp=CAPTURE_OpenFile("serlog",".serlog.txt"); else debugfp=0; if(debugfp == 0) { |