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

meeeeerging

Browse Source
This commit is contained in:
Jonas Zeunert
2018-11-09 13:07:36 +01:00
parent 8eb1f724ea be582e9f7f
commit 90fcee2b45
76 changed files with 495 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
#include "IDisplay.h"
#include "ISound.h"
namespace FlippR_Driver
namespace flippR_driver
{
namespace output
{
@@ -25,10 +25,15 @@ 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;
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();
@@ -41,8 +46,22 @@ 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();
std::shared_ptr<ICabinetItem> 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<ICabinetItem>> cabinet_items;
std::map<char, std::shared_ptr<IDisplay>> displays;
std::map<std::string, std::shared_ptr<ISound>> sounds;
>>>>>>> be582e9f7f0d29518665a131afce24ca0a43386e
};
} /* namespace output */
}
#endif
#endif