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

Cleanup Scene (in particular group) for simplified use in views

Browse Source 
(background and foreground).
This commit is contained in:
brunoherbelin
2020-05-09 10:12:04 +02:00
parent c1b76de6e0
commit ef34bed90a
15 changed files with 123 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Mixer.cpp
View File

@@ -1,4 +1,5 @@
#include <algorithm>
#include <thread>
#include <tinyxml2.h>
#include "tinyxml2Toolkit.h"
@@ -16,11 +17,26 @@ using namespace tinyxml2;
#include "GarbageVisitor.h"
#include "SessionVisitor.h"
#include "SessionCreator.h"
#include "MediaPlayer.h"
#include "Mixer.h"
// static objects for multithreaded session loading
static bool sessionLoadPending_ = false;
static bool sessionLoadFinished_ = false;
static Session *loadedSession;
static void loadSession(const std::string& filename, )
{
sessionLoadPending_ = true;
sessionLoadFinished_ = true;
}
Mixer::Mixer() : session_(nullptr), current_view_(nullptr)
{
// this initializes with a new empty session
@@ -78,9 +94,9 @@ void Mixer::insertSource(Source *s)
// add sources Nodes to ALL views
// Mixing Node
mixing_.scene.root()->addChild(s->group(View::MIXING));
mixing_.scene.fg()->attach(s->group(View::MIXING));
// Geometry Node
geometry_.scene.root()->addChild(s->group(View::GEOMETRY));
geometry_.scene.fg()->attach(s->group(View::GEOMETRY));
}
void Mixer::deleteSource(Source *s)
@@ -95,15 +111,8 @@ void Mixer::deleteSource(Source *s)
unsetCurrentSource();
// remove source Nodes from views
// GarbageVisitor mixingremover(s->group(View::MIXING));
// mixingremover.visit(mixing_.scene);
// GarbageVisitor geomremover(s->group(View::GEOMETRY));
// geomremover.visit(geometry_.scene);
Log::Info("MIXING");
mixing_.scene.root()->detatchChild( s->group(View::MIXING) );
Log::Info("GEOMETRY");
geometry_.scene.root()->detatchChild( s->group(View::GEOMETRY) );
mixing_.scene.fg()->detatch( s->group(View::MIXING) );
geometry_.scene.fg()->detatch( s->group(View::GEOMETRY) );
// delete source
session_->deleteSource(s);
@@ -306,8 +315,8 @@ bool Mixer::open(const std::string& filename)
SourceList::iterator source_iter;
for (source_iter = new_session->begin(); source_iter != new_session->end(); source_iter++)
{
mixing_.scene.root()->addChild( (*source_iter)->group(View::MIXING) );
geometry_.scene.root()->addChild( (*source_iter)->group(View::GEOMETRY) );
mixing_.scene.fg()->attach( (*source_iter)->group(View::MIXING) );
geometry_.scene.fg()->attach( (*source_iter)->group(View::GEOMETRY) );
}
}
@@ -331,23 +340,15 @@ bool Mixer::open(const std::string& filename)
void Mixer::newSession(Session *newsession)
{
// delete session : delete all sources
// delete session & detatch nodes from views
if (session_) {
// remove nodes from views
for (auto source_iter = session_->begin(); source_iter != session_->end(); source_iter++)
{
// GarbageVisitor mixingremover( (*source_iter)->group(View::MIXING) );
// mixingremover.visit(mixing_.scene);
// GarbageVisitor geomremover( (*source_iter)->group(View::GEOMETRY) );
// geomremover.visit(geometry_.scene);
Log::Info("MIXING");
mixing_.scene.root()->detatchChild( (*source_iter)->group(View::MIXING) );
Log::Info("GEOMETRY");
geometry_.scene.root()->detatchChild( (*source_iter)->group(View::GEOMETRY) );
mixing_.scene.fg()->detatch( (*source_iter)->group(View::MIXING) );
geometry_.scene.fg()->detatch( (*source_iter)->group(View::GEOMETRY) );
}
// clear session
// clear session: delete all sources
delete session_;
}