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

alter stand hoffentlich

Browse Source
This commit is contained in:
Johannes Wendel
2018-11-09 15:08:16 +01:00
parent 4ed5b9e4cd
commit 062a729c92
7 changed files with 8 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
FlippR-Driver/src/output/OutputDriver.h
View File

@@ -13,7 +13,7 @@
#include <map>
#include <memory>
#include "IOutputItem.h"
#include "ICabinetItem.h"
#include "IDisplay.h"
#include "ISound.h"
@@ -25,28 +25,10 @@ namespace output
class OutputDriver : public IOutputDriver
{
public:
<<<<<<< HEAD
OutputDriver(std::map<std::string, std::shared_ptr<IOutputItem>> cabinet_items, std::map<char, std::shared_ptr<IDisplay>> displays, std::map<std::string, std::shared_ptr<ISound>> sounds);
=======
OutputDriver(std::map<std::string, std::shared_ptr<ICabinetItem>> cabinet_items, std::map<char, std::shared_ptr<IDisplay>> displays, std::map<std::string, std::shared_ptr<ISound>> sounds);
>>>>>>> be582e9f7f0d29518665a131afce24ca0a43386e
virtual ~OutputDriver() = default;
<<<<<<< HEAD
std::vector<std::shared_ptr<IOutputItem>> get_cabinet_items();
std::vector<std::shared_ptr<ISound>> get_sounds();
std::vector<std::shared_ptr<IDisplay>> get_displays();
std::shared_ptr<IOutputItem> get_cabinet_item(std::string name);
std::shared_ptr<ISound> get_sound(std::string name);
std::shared_ptr<IDisplay> get_display(char number);
private:
std::map<std::string, std::shared_ptr<IOutputItem>> cabinet_items;
std::map<char, std::shared_ptr<IDisplay>> displays;
std::map<std::string, std::shared_ptr<ISound>> sounds;
=======
std::vector<std::shared_ptr<ICabinetItem>> get_cabinet_items();
std::vector<std::shared_ptr<ISound>> get_sounds();
std::vector<std::shared_ptr<IDisplay>> get_displays();
@@ -59,7 +41,6 @@ private:
std::map<std::string, std::shared_ptr<ICabinetItem>> cabinet_items;
std::map<char, std::shared_ptr<IDisplay>> displays;
std::map<std::string, std::shared_ptr<ISound>> sounds;
>>>>>>> be582e9f7f0d29518665a131afce24ca0a43386e
};
} /* namespace output */