mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::string for midi filenames

pull/10933/head
Rubidium 2023-05-30 22:25:00 +02:00 committed by rubidium42
parent 84037d4a57
commit 556b44713e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/music/midifile.cpp
View File

@ -413,7 +413,7 @@ static bool FixupMidiData(MidiFile &target)
* @param[out] header filled with data read * @param[out] header filled with data read
* @return true if the file could be opened and contained a header with correct format * @return true if the file could be opened and contained a header with correct format
*/ */
bool MidiFile::ReadSMFHeader(const char *filename, SMFHeader &header) bool MidiFile::ReadSMFHeader(const std::string &filename, SMFHeader &header)
{ {
FILE *file = FioFOpenFile(filename, "rb", Subdirectory::BASESET_DIR); FILE *file = FioFOpenFile(filename, "rb", Subdirectory::BASESET_DIR);
if (!file) return false; if (!file) return false;
@ -455,7 +455,7 @@ bool MidiFile::ReadSMFHeader(FILE *file, SMFHeader &header)
* @param filename name of the file to load * @param filename name of the file to load
* @returns true if loaded was successful * @returns true if loaded was successful
*/ */
bool MidiFile::LoadFile(const char *filename) bool MidiFile::LoadFile(const std::string &filename)
{ {
_midifile_instance = this; _midifile_instance = this;
@ -850,7 +850,7 @@ bool MidiFile::LoadSong(const MusicSongInfo &song)
{ {
switch (song.filetype) { switch (song.filetype) {
case MTT_STANDARDMIDI: case MTT_STANDARDMIDI:
return this->LoadFile(song.filename.c_str()); return this->LoadFile(song.filename);
case MTT_MPSMIDI: case MTT_MPSMIDI:
{ {
size_t songdatalen = 0; size_t songdatalen = 0;
@ -916,7 +916,7 @@ static void WriteVariableLen(FILE *f, uint32 value)
* @param filename Name of file to write to * @param filename Name of file to write to
* @return True if the file was written to completion * @return True if the file was written to completion
*/ */
bool MidiFile::WriteSMF(const char *filename) bool MidiFile::WriteSMF(const std::string &filename)
{ {
FILE *f = FioFOpenFile(filename, "wb", Subdirectory::NO_DIRECTORY); FILE *f = FioFOpenFile(filename, "wb", Subdirectory::NO_DIRECTORY);
if (!f) { if (!f) {
@ -1100,7 +1100,7 @@ std::string MidiFile::GetSMFFile(const MusicSongInfo &song)
} }
free(data); free(data);
if (midifile.WriteSMF(output_filename.c_str())) { if (midifile.WriteSMF(output_filename)) {
return output_filename; return output_filename;
} else { } else {
return std::string(); return std::string();
@ -1124,14 +1124,10 @@ static bool CmdDumpSMF(byte argc, char *argv[])
return false; return false;
} }
char fnbuf[MAX_PATH] = { 0 }; std::string filename = fmt::format("{}{}", FiosGetScreenshotDir(), argv[1]);
if (seprintf(fnbuf, lastof(fnbuf), "%s%s", FiosGetScreenshotDir(), argv[1]) >= (int)lengthof(fnbuf)) { IConsolePrint(CC_INFO, "Dumping MIDI to '{}'.", filename);
IConsolePrint(CC_ERROR, "Filename too long.");
return false;
}
IConsolePrint(CC_INFO, "Dumping MIDI to '{}'.", fnbuf);
if (_midifile_instance->WriteSMF(fnbuf)) { if (_midifile_instance->WriteSMF(filename)) {
IConsolePrint(CC_INFO, "File written successfully."); IConsolePrint(CC_INFO, "File written successfully.");
return true; return true;
} else { } else {

6
src/music/midifile.hpp
View File

@ -35,15 +35,15 @@ struct MidiFile {
MidiFile(); MidiFile();
~MidiFile(); ~MidiFile();
bool LoadFile(const char *filename); bool LoadFile(const std::string &filename);
bool LoadMpsData(const byte *data, size_t length); bool LoadMpsData(const byte *data, size_t length);
bool LoadSong(const MusicSongInfo &song); bool LoadSong(const MusicSongInfo &song);
void MoveFrom(MidiFile &other); void MoveFrom(MidiFile &other);
bool WriteSMF(const char *filename); bool WriteSMF(const std::string &filename);
static std::string GetSMFFile(const MusicSongInfo &song); static std::string GetSMFFile(const MusicSongInfo &song);
static bool ReadSMFHeader(const char *filename, SMFHeader &header); static bool ReadSMFHeader(const std::string &filename, SMFHeader &header);
static bool ReadSMFHeader(FILE *file, SMFHeader &header); static bool ReadSMFHeader(FILE *file, SMFHeader &header);
}; };