|
@@ -8,8 +8,17 @@
|
|
App::App()
|
|
App::App()
|
|
{
|
|
{
|
|
|
|
|
|
- m_audio = std::make_unique<Audio>(Audio());
|
|
|
|
- m_window = std::make_unique<BaseWindow>(BaseWindow(800, 600, "Music", grey, *m_audio));
|
|
|
|
|
|
+ m_audio = std::make_unique<Audio>();
|
|
|
|
+ m_window = std::make_unique<BaseWindow>(
|
|
|
|
+ 800, 600, "Music", grey, m_audio.get()
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //BaseWindow *base = new BaseWindow(800, 600, "Music", grey, *m_audio);
|
|
|
|
+ //base->run();
|
|
|
|
+
|
|
|
|
+ //delete base;
|
|
|
|
+ // m_window = std::make_unique<BaseWindow>(BaseWindow(800, 600, "Music", grey, *m_audio));
|
|
}
|
|
}
|
|
|
|
|
|
void App::Run()
|
|
void App::Run()
|
|
@@ -17,4 +26,4 @@ void App::Run()
|
|
if (m_window->run()) {
|
|
if (m_window->run()) {
|
|
std::cout << "Something wrong happened. Quitting.\n";
|
|
std::cout << "Something wrong happened. Quitting.\n";
|
|
}
|
|
}
|
|
-}
|
|
|
|
|
|
+}
|