Codechange: Pass std::string_view from drivers instead of char *.
This commit is contained in:
committed by
Peter Nelson
parent
a42aa1a086
commit
332cbca36e
@@ -35,10 +35,10 @@
|
||||
/** Factory for the midi player that uses external players. */
|
||||
static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
|
||||
|
||||
const char *MusicDriver_ExtMidi::Start(const StringList &parm)
|
||||
std::optional<std::string_view> MusicDriver_ExtMidi::Start(const StringList &parm)
|
||||
{
|
||||
if (strcmp(VideoDriver::GetInstance()->GetName(), "allegro") == 0 ||
|
||||
strcmp(SoundDriver::GetInstance()->GetName(), "allegro") == 0) {
|
||||
if (VideoDriver::GetInstance()->GetName() == "allegro" ||
|
||||
SoundDriver::GetInstance()->GetName() == "allegro") {
|
||||
return "the extmidi driver does not work when Allegro is loaded.";
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ const char *MusicDriver_ExtMidi::Start(const StringList &parm)
|
||||
|
||||
this->song.clear();
|
||||
this->pid = -1;
|
||||
return nullptr;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
void MusicDriver_ExtMidi::Stop()
|
||||
|
||||
Reference in New Issue
Block a user