summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/cdrom.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2024-05-22 05:43:24 +1000
committer Vas Crabb <vas@vastheman.com>2024-05-22 05:43:24 +1000
commitc83e1c5aa144542a95b94f704a1d16faa3d8ab45 (patch)
treeeef574f57bb4fe759c47ae06c9d1eb0175a08592 /src/lib/util/cdrom.h
parentd8610cccfac825ce55ccd6de75c5efe1c51d0338 (diff)
Cleanup:
* olympia/dday.cpp: Correctly size the inappropriately named "color RAM". * util/cdrom.cpp, formats/fs_fat.cpp: More const, less copying.
Diffstat (limited to 'src/lib/util/cdrom.h')
-rw-r--r--src/lib/util/cdrom.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/util/cdrom.h b/src/lib/util/cdrom.h
index dd62badeff1..b11ecb5b3ba 100644
--- a/src/lib/util/cdrom.h
+++ b/src/lib/util/cdrom.h
@@ -16,6 +16,12 @@
#include "ioprocs.h"
#include "osdcore.h"
+#include <algorithm>
+#include <string>
+#include <string_view>
+#include <system_error>
+
+
class cdrom_file {
public:
// tracks are padded to a multiple of this many frames
@@ -159,7 +165,8 @@ public:
static std::error_condition parse_toc(std::string_view tocfname, toc &outtoc, track_input_info &outinfo);
int get_last_session() const { return cdtoc.numsessions ? cdtoc.numsessions : 1; }
int get_last_track() const { return cdtoc.numtrks; }
- int get_adr_control(int track) const {
+ int get_adr_control(int track) const
+ {
if (track == 0xaa)
track = get_last_track() - 1; // use last track's flags
int adrctl = (CD_FLAG_ADR_START_TIME << 4) | (cdtoc.tracks[track].control_flags & 0x0f);
@@ -282,8 +289,8 @@ private:
static std::string get_file_path(std::string &path);
static uint64_t get_file_size(std::string_view filename);
- static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize );
- static int msf_to_frames( char *token );
+ static int tokenize(const char *linebuffer, int i, int linebuffersize, char *token, int tokensize);
+ static int msf_to_frames(const char *token);
static uint32_t parse_wav_sample(std::string_view filename, uint32_t *dataoffs);
static uint16_t read_uint16(FILE *infile);
static uint32_t read_uint32(FILE *infile);