Merge branch 'master' of github.com:swinginbird/flippr-code
This commit is contained in:
@@ -15,8 +15,8 @@ namespace flippR_driver
|
||||
namespace output
|
||||
{
|
||||
|
||||
OutputDriver::OutputDriver(std::map<std::string, std::shared_ptr<IOutputtItem>> cabinet_items, std::map<char, std::shared_ptr<IDisplay>> displays, std::map<std::string, std::shared_ptr<ISound>> sounds)
|
||||
: cabinet_items(cabinet_items), displays(displays), sounds(sounds)
|
||||
OutputDriver::OutputDriver(std::map<std::string, std::shared_ptr<ISolenoid>> solenoids, std::map<std::string, std::shared_ptr<ILamp>> lamps, std::map<char, std::shared_ptr<IDisplay>> displays, std::map<std::string, std::shared_ptr<ISound>> sounds)
|
||||
: solenoids(solenoids), lamps(lamps), displays(displays), sounds(sounds)
|
||||
{}
|
||||
|
||||
std::vector<std::shared_ptr<IOutputtItem>> OutputDriver::get_cabinet_items()
|
||||
|
||||
Reference in New Issue
Block a user