From e26052013c6d8dc40c06658b81fb4cd3f6201e62 Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Sat, 30 Jan 2021 22:45:27 +0100 Subject: [PATCH] Matching creation of new session source with recent changes on SessionSource. --- ImGuiVisitor.cpp | 2 +- Mixer.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ImGuiVisitor.cpp b/ImGuiVisitor.cpp index 012fc66..e90e119 100644 --- a/ImGuiVisitor.cpp +++ b/ImGuiVisitor.cpp @@ -475,7 +475,7 @@ void ImGuiVisitor::visit (SessionSource& s) ImGuiToolkit::Icon(s.icon().x, s.icon().y); ImGui::SameLine(0, 10); ImGui::Text("Session File"); - ImGui::Text("%s", SystemToolkit::base_filename(s.path()).c_str()); +// ImGui::Text("%s", SystemToolkit::base_filename(s.path()).c_str()); if (ImGuiToolkit::ButtonIcon(3, 2)) s.session()->setFading(0.f); float f = s.session()->fading(); diff --git a/Mixer.cpp b/Mixer.cpp index 3c2c6ad..75adbc5 100644 --- a/Mixer.cpp +++ b/Mixer.cpp @@ -252,7 +252,7 @@ Source * Mixer::createSourceFile(const std::string &path) if ( ext == "mix" ) { // create a session source - SessionSource *ss = new SessionSource(); + SessionSource *ss = new SessionSource; ss->load(path); s = ss; } @@ -824,7 +824,7 @@ void Mixer::open(const std::string& filename) Log::Info("\nStarting transition to session %s", filename.c_str()); // create special SessionSource to be used for the smooth transition - SessionSource *ts = new SessionSource(); + SessionSource *ts = new SessionSource; // open filename if specified if (!filename.empty()) ts->load(filename); @@ -998,7 +998,6 @@ void Mixer::close() { // create empty SessionSource to be used for the smooth transition SessionSource *ts = new SessionSource; - ts->load(); // insert source and switch to transition view insertSource(ts, View::TRANSITION);