Merge branch 'master' into jgrpp-beta

# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2021-09-27 22:47:13 +01:00
204 changed files with 1829 additions and 1549 deletions

View File

@@ -34,7 +34,7 @@ if(NOT OPTION_DEDICATED)
add_files(
bemidi.cpp
bemidi.h
CONDITION OPTION_HAIKU
CONDITION HAIKU
)
add_files(

View File

@@ -13,14 +13,8 @@
#include "../base_media_base.h"
#include "midifile.hpp"
/* BeOS System Includes */
#include <MidiSynthFile.h>
#include "../safeguards.h"
/** The file we're playing. */
static BMidiSynthFile midiSynthFile;
/** Factory for BeOS' midi player. */
static FMusicDriver_BeMidi iFMusicDriver_BeMidi;
@@ -31,7 +25,7 @@ const char *MusicDriver_BeMidi::Start(const StringList &parm)
void MusicDriver_BeMidi::Stop()
{
midiSynthFile.UnloadFile();
this->StopSong();
}
void MusicDriver_BeMidi::PlaySong(const MusicSongInfo &song)
@@ -39,25 +33,44 @@ void MusicDriver_BeMidi::PlaySong(const MusicSongInfo &song)
std::string filename = MidiFile::GetSMFFile(song);
this->Stop();
this->midi_synth_file = new BMidiSynthFile();
if (!filename.empty()) {
entry_ref midiRef;
get_ref_for_path(filename.c_str(), &midiRef);
midiSynthFile.LoadFile(&midiRef);
midiSynthFile.Start();
if (this->midi_synth_file->LoadFile(&midiRef) == B_OK) {
this->midi_synth_file->SetVolume(this->current_volume);
this->midi_synth_file->Start();
this->just_started = true;
} else {
this->Stop();
}
}
}
void MusicDriver_BeMidi::StopSong()
{
midiSynthFile.UnloadFile();
/* Reusing BMidiSynthFile can cause stuck notes when switching
* tracks, just delete whole object entirely. */
delete this->midi_synth_file;
this->midi_synth_file = nullptr;
}
bool MusicDriver_BeMidi::IsSongPlaying()
{
return !midiSynthFile.IsFinished();
if (this->midi_synth_file == nullptr) return false;
/* IsFinished() returns true for a moment after Start()
* but before it really starts playing, use just_started flag
* to prevent accidental track skipping. */
if (this->just_started) {
if (!this->midi_synth_file->IsFinished()) this->just_started = false;
return true;
}
return !this->midi_synth_file->IsFinished();
}
void MusicDriver_BeMidi::SetVolume(byte vol)
{
fprintf(stderr, "BeMidi: Set volume not implemented\n");
this->current_volume = vol / 128.0;
if (this->midi_synth_file != nullptr) this->midi_synth_file->SetVolume(this->current_volume);
}

View File

@@ -12,6 +12,9 @@
#include "music_driver.hpp"
/* For BMidiSynthFile */
#include <MidiSynthFile.h>
/** The midi player for BeOS. */
class MusicDriver_BeMidi : public MusicDriver {
public:
@@ -27,6 +30,11 @@ public:
void SetVolume(byte vol) override;
const char *GetName() const override { return "bemidi"; }
private:
BMidiSynthFile *midi_synth_file = nullptr;
double current_volume = 1.0;
bool just_started = false;
};
/** Factory for the BeOS midi player. */