Traktor: Added "playing" and "stop" methods to Theater component.

apistol78 · Apr 22, 2024 · f5a12bb · f5a12bb
1 parent c552ade
commit f5a12bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/code/Theater/TheaterClassFactory.cpp b/code/Theater/TheaterClassFactory.cpp
@@ -19,7 +19,9 @@ T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.scene.TheaterClassFactory", 0, TheaterC
 void TheaterClassFactory::createClasses(IRuntimeClassRegistrar* registrar) const
 {
 	auto classTheaterComponent = new AutoRuntimeClass< TheaterComponent >();
+	classTheaterComponent->addProperty("playing", &TheaterComponent::isPlaying);
 	classTheaterComponent->addMethod("play", &TheaterComponent::play);
+	classTheaterComponent->addMethod("stop", &TheaterComponent::stop);
 	registrar->registerClass(classTheaterComponent);
 }
 

diff --git a/code/Theater/TheaterComponent.cpp b/code/Theater/TheaterComponent.cpp
@@ -48,7 +48,8 @@ void TheaterComponent::update(world::World* world, const world::UpdateParams& up
 		return;
 
 	// Evaluate current act.
-	m_act->update(world, update.totalTime - m_timeStart, update.deltaTime);
+	if (!m_act->update(world, update.totalTime - m_timeStart, update.deltaTime))
+		m_act = nullptr;
 
 	m_timeLast = update.totalTime;
 }
@@ -74,4 +75,9 @@ bool TheaterComponent::play(const std::wstring& actName)
 	return true;
 }
 
+void TheaterComponent::stop()
+{
+	m_act = nullptr;
+}
+
 }
diff --git a/code/Theater/TheaterComponent.h b/code/Theater/TheaterComponent.h
@@ -41,6 +41,10 @@ class T_DLLCLASS TheaterComponent : public world::IWorldComponent
 
 	bool play(const std::wstring& actName);
 
+	void stop();
+
+	bool isPlaying() const { return m_act != nullptr; }
+
 private:
 	friend class TheaterComponentEditor;