6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-09 17:29:36 +00:00
Code Issues Projects Releases Wiki Activity

Introduces a presentation flag for LEDs.

Browse Source 
All existing receivers ignore it.
This commit is contained in:
Thomas Harte 2021-07-15 21:26:02 -04:00
parent 2731ca8c92
commit 52ea3b741c
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Activity/Observer.hpp
View File

@ -23,8 +23,12 @@ namespace Activity {
*/
class Observer {
public:
enum LEDPresentation: uint8_t {
Persistent = (1 << 0),
};
/// Announces to the receiver that there is an LED of name @c name.
virtual void register_led([[maybe_unused]] const std::string &name) {}
virtual void register_led([[maybe_unused]] const std::string &name, [[maybe_unused]] uint8_t presentation = 0) {}
/// Announces to the receiver that there is a drive of name @c name.
///

2
Machines/Electron/Electron.cpp
View File

@ -607,7 +607,7 @@ template <bool has_scsi_bus> class ConcreteMachine:
void set_activity_observer(Activity::Observer *observer) final {
activity_observer_ = observer;
if(activity_observer_) {
activity_observer_->register_led(caps_led);
activity_observer_->register_led(caps_led, Activity::Observer::LEDPresentation::Persistent);
activity_observer_->set_led_status(caps_led, caps_led_state_);
}

2
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -61,7 +61,7 @@ struct SpeakerDelegate: public Outputs::Speaker::Speaker::Delegate, public LockP
};
struct ActivityObserver: public Activity::Observer {
void register_led(const std::string &name) final {
void register_led(const std::string &name, uint8_t) final {
[machine addLED:[NSString stringWithUTF8String:name.c_str()]];
}

2
OSBindings/Qt/mainwindow.cpp
View File

@ -1323,7 +1323,7 @@ void MainWindow::addActivityObserver() {
activitySource->set_activity_observer(this);
}
void MainWindow::register_led(const std::string &name) {
void MainWindow::register_led(const std::string &name, uint8_t) {
std::lock_guard guard(ledStatusesLock);
ledStatuses[name] = false;
QMetaObject::invokeMethod(this, "updateStatusBarText");

2
OSBindings/Qt/mainwindow.h
View File

@ -152,7 +152,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
KeyboardMapper keyMapper;
void register_led(const std::string &) override;
void register_led(const std::string &, uint8_t) override;
void set_led_status(const std::string &, bool) override;
std::recursive_mutex ledStatusesLock;

2
OSBindings/SDL/main.cpp
View File

@ -271,7 +271,7 @@ class ActivityObserver: public Activity::Observer {
private:
std::vector<std::string> leds_;
void register_led(const std::string &name) final {
void register_led(const std::string &name, uint8_t) final {
std::lock_guard lock_guard(mutex);
leds_.push_back(name);
}