rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hmmm dunno if this is better

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-11 12:30:27 +01:00
parent 3103fb77c7
commit 20774b5b1f
16 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FlippR-Driver/src/output/items/Sound.h
View File

@@ -9,16 +9,13 @@
#define _SRC_OUTPUT_SOUND_H_
#include "output/items/ISound.h"
#include "output/items/ISoundItem.h"
#include "Item.h"
#include "output/items/SoundItem.h"
#include <memory>
#include <string>
#include <chrono>
#include <future>
namespace flippR_driver
{
namespace output
@@ -26,7 +23,7 @@ namespace output
namespace items
{
class Sound : public ISound, public Item, public ISoundItem
class Sound : public SoundItem, public ISound
{
public:
u_int id;
@@ -35,9 +32,6 @@ public:
Sound(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id);
~Sound() override = default;
std::string get_name() override;
uint8_t get_address() override;
void play() override;
private: