mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-21 05:29:11 +00:00
Code Issues Activity

Codechange: Use std::string in the driver and blitter selection code.

Browse Source
This commit is contained in:
Michael Lutz
2020-05-17 23:32:08 +02:00
parent a49fdb7ebb
commit 37bc2f8064
51 changed files with 126 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/music/allegro_m.cpp
View File

@@ -26,7 +26,7 @@ static MIDI *_midi = nullptr;
*/
extern int _allegro_instance_count;
const char *MusicDriver_Allegro::Start(const char * const *param)
const char *MusicDriver_Allegro::Start(const StringList &param)
{
if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, nullptr)) {
DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);

2
src/music/allegro_m.h
View File

@@ -15,7 +15,7 @@
/** Allegro's music player. */
class MusicDriver_Allegro : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/bemidi.cpp
View File

@@ -24,7 +24,7 @@ static BMidiSynthFile midiSynthFile;
/** Factory for BeOS' midi player. */
static FMusicDriver_BeMidi iFMusicDriver_BeMidi;
const char *MusicDriver_BeMidi::Start(const char * const *parm)
const char *MusicDriver_BeMidi::Start(const StringList &parm)
{
return nullptr;
}

2
src/music/bemidi.h
View File

@@ -15,7 +15,7 @@
/** The midi player for BeOS. */
class MusicDriver_BeMidi : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/cocoa_m.cpp
View File

@@ -79,7 +79,7 @@ static void DoSetVolume()
/**
* Initialized the MIDI player, including QuickTime initialization.
*/
const char *MusicDriver_Cocoa::Start(const char * const *parm)
const char *MusicDriver_Cocoa::Start(const StringList &parm)
{
if (NewMusicPlayer(&_player) != noErr) return "failed to create music player";

2
src/music/cocoa_m.h
View File

@@ -14,7 +14,7 @@
class MusicDriver_Cocoa : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/dmusic.cpp
View File

@@ -1071,7 +1071,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
}
const char *MusicDriver_DMusic::Start(const char * const *parm)
const char *MusicDriver_DMusic::Start(const StringList &parm)
{
/* Initialize COM */
if (FAILED(CoInitializeEx(nullptr, COINITBASE_MULTITHREADED))) return "COM initialization failed";

2
src/music/dmusic.h
View File

@@ -17,7 +17,7 @@ class MusicDriver_DMusic : public MusicDriver {
public:
virtual ~MusicDriver_DMusic();
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/extmidi.cpp
View File

@@ -36,7 +36,7 @@
/** Factory for the midi player that uses external players. */
static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
const char *MusicDriver_ExtMidi::Start(const char * const * parm)
const char *MusicDriver_ExtMidi::Start(const StringList &parm)
{
if (strcmp(VideoDriver::GetInstance()->GetName(), "allegro") == 0 ||
strcmp(SoundDriver::GetInstance()->GetName(), "allegro") == 0) {

2
src/music/extmidi.h
View File

@@ -22,7 +22,7 @@ private:
void DoStop();
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/fluidsynth.cpp
View File

@@ -50,7 +50,7 @@ static void RenderMusicStream(int16 *buffer, size_t samples)
fluid_synth_write_s16(_midi.synth, samples, buffer, 0, 2, buffer, 1, 2);
}
const char *MusicDriver_FluidSynth::Start(const char * const *param)
const char *MusicDriver_FluidSynth::Start(const StringList &param)
{
std::lock_guard<std::mutex> lock{ _midi.synth_mutex };

2
src/music/fluidsynth.h
View File

@@ -15,7 +15,7 @@
/** Music driver making use of FluidSynth. */
class MusicDriver_FluidSynth : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/music_driver.hpp
View File

@@ -48,6 +48,6 @@ public:
}
};
extern char *_ini_musicdriver;
extern std::string _ini_musicdriver;
#endif /* MUSIC_MUSIC_DRIVER_HPP */

2
src/music/null_m.h
View File

@@ -15,7 +15,7 @@
/** The music player that does nothing. */
class MusicDriver_Null : public MusicDriver {
public:
const char *Start(const char * const *param) override { return nullptr; }
const char *Start(const StringList &param) override { return nullptr; }
void Stop() override { }

2
src/music/os2_m.cpp
View File

@@ -80,7 +80,7 @@ bool MusicDriver_OS2::IsSongPlaying()
return strcmp(buf, "playing") == 0 || strcmp(buf, "seeking") == 0;
}
const char *MusicDriver_OS2::Start(const char * const *parm)
const char *MusicDriver_OS2::Start(const StringList &parm)
{
return 0;
}

2
src/music/os2_m.h
View File

@@ -15,7 +15,7 @@
/** OS/2's music player. */
class MusicDriver_OS2 : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;

2
src/music/win32_m.cpp
View File

@@ -362,7 +362,7 @@ void MusicDriver_Win32::SetVolume(byte vol)
_midi.new_volume = vol;
}
const char *MusicDriver_Win32::Start(const char * const *parm)
const char *MusicDriver_Win32::Start(const StringList &parm)
{
DEBUG(driver, 2, "Win32-MIDI: Start: initializing");

2
src/music/win32_m.h
View File

@@ -15,7 +15,7 @@
/** The Windows music player. */
class MusicDriver_Win32 : public MusicDriver {
public:
const char *Start(const char * const *param) override;
const char *Start(const StringList &param) override;
void Stop() override;