eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-15 12:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Matching creation of new session source with recent changes on

Browse Source 
SessionSource.
This commit is contained in:
brunoherbelin
2021-01-30 22:45:27 +01:00
parent 9215be6bfc
commit e26052013c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ImGuiVisitor.cpp
View File

@@ -475,7 +475,7 @@ void ImGuiVisitor::visit (SessionSource& s)
ImGuiToolkit::Icon(s.icon().x, s.icon().y); ImGuiToolkit::Icon(s.icon().x, s.icon().y);
ImGui::SameLine(0, 10); ImGui::SameLine(0, 10);
ImGui::Text("Session File"); 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); if (ImGuiToolkit::ButtonIcon(3, 2)) s.session()->setFading(0.f);
float f = s.session()->fading(); float f = s.session()->fading();

5
Mixer.cpp
View File

@@ -252,7 +252,7 @@ Source * Mixer::createSourceFile(const std::string &path)
if ( ext == "mix" ) if ( ext == "mix" )
{ {
// create a session source // create a session source
SessionSource *ss = new SessionSource(); SessionSource *ss = new SessionSource;
ss->load(path); ss->load(path);
s = ss; s = ss;
} }
@@ -824,7 +824,7 @@ void Mixer::open(const std::string& filename)
Log::Info("\nStarting transition to session %s", filename.c_str()); Log::Info("\nStarting transition to session %s", filename.c_str());
// create special SessionSource to be used for the smooth transition // create special SessionSource to be used for the smooth transition
SessionSource *ts = new SessionSource(); SessionSource *ts = new SessionSource;
// open filename if specified // open filename if specified
if (!filename.empty()) if (!filename.empty())
ts->load(filename); ts->load(filename);
@@ -998,7 +998,6 @@ void Mixer::close()
{ {
// create empty SessionSource to be used for the smooth transition // create empty SessionSource to be used for the smooth transition
SessionSource *ts = new SessionSource; SessionSource *ts = new SessionSource;
ts->load();
// insert source and switch to transition view // insert source and switch to transition view
insertSource(ts, View::TRANSITION); insertSource(ts, View::TRANSITION);