fix execution bugs

ossia · Nov 18, 2015 · 2cd2027 · 2cd2027
1 parent 620ddf9
commit 2cd2027
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/base/plugins/iscore-plugin-ossia/DocumentPlugin/OSSIADocumentPlugin.cpp b/base/plugins/iscore-plugin-ossia/DocumentPlugin/OSSIADocumentPlugin.cpp
@@ -20,7 +20,7 @@
 OSSIADocumentPlugin::OSSIADocumentPlugin(iscore::Document& doc, QObject* parent):
     iscore::DocumentDelegatePluginModel{doc, "OSSIADocumentPlugin", parent}
 {
-    reload(doc.model());
+    //reload(doc.model());
 }
 
 void OSSIADocumentPlugin::reload(iscore::DocumentModel &doc)
@@ -29,6 +29,12 @@ void OSSIADocumentPlugin::reload(iscore::DocumentModel &doc)
     m_base = new OSSIABaseScenarioElement{baseElement, this};
 }
 
+void OSSIADocumentPlugin::clear()
+{
+    delete m_base;
+    m_base = nullptr;
+}
+
 OSSIABaseScenarioElement *OSSIADocumentPlugin::baseScenario() const
 {
     return m_base;

diff --git a/base/plugins/iscore-plugin-ossia/DocumentPlugin/OSSIADocumentPlugin.hpp b/base/plugins/iscore-plugin-ossia/DocumentPlugin/OSSIADocumentPlugin.hpp
@@ -13,6 +13,7 @@ class OSSIADocumentPlugin final : public iscore::DocumentDelegatePluginModel
         OSSIADocumentPlugin(iscore::Document& doc, QObject* parent);
 
         void reload(iscore::DocumentModel& doc);
+        void clear();
 
         OSSIABaseScenarioElement* baseScenario() const;
 

diff --git a/base/plugins/iscore-plugin-ossia/OSSIAControl.cpp b/base/plugins/iscore-plugin-ossia/OSSIAControl.cpp
@@ -97,11 +97,6 @@ OSSIAConstraintElement &OSSIAControl::baseConstraint() const
     return *currentDocument()->model().pluginModel<OSSIADocumentPlugin>()->baseScenario()->baseConstraint();
 }
 
-OSSIABaseScenarioElement&OSSIAControl::baseScenario() const
-{
-    return *currentDocument()->model().pluginModel<OSSIADocumentPlugin>()->baseScenario();
-}
-
 void OSSIAControl::populateMenus(iscore::MenubarManager* menu)
 {
 }
@@ -122,27 +117,27 @@ void OSSIAControl::on_newDocument(iscore::Document* doc)
 
 void OSSIAControl::on_loadedDocument(iscore::Document *doc)
 {
-    if(auto plugmodel = doc->model().pluginModel<OSSIADocumentPlugin>())
-    {
-        plugmodel->reload(doc->model());
-    }
-    else
-    {
-        on_newDocument(doc);
-    }
+    on_newDocument(doc);
 }
 
 void OSSIAControl::on_play(bool b)
 {
     if(auto doc = currentDocument())
     {
-        auto& cstr = *doc->model().pluginModel<OSSIADocumentPlugin>()->baseScenario()->baseConstraint();
         if(b)
         {
             if(m_playing)
+            {
+                auto& cstr = *doc->model().pluginModel<OSSIADocumentPlugin>()->baseScenario()->baseConstraint();
                 cstr.OSSIAConstraint()->resume();
+            }
             else
             {
+                auto plugmodel = doc->model().pluginModel<OSSIADocumentPlugin>();
+                plugmodel->reload(doc->model());
+
+                auto& cstr = *plugmodel->baseScenario()->baseConstraint();
+
                 cstr.recreate();
                 cstr.play();
 
@@ -158,6 +153,7 @@ void OSSIAControl::on_play(bool b)
         }
         else
         {
+            auto& cstr = *doc->model().pluginModel<OSSIADocumentPlugin>()->baseScenario()->baseConstraint();
             cstr.OSSIAConstraint()->pause();
         }
     }
@@ -167,10 +163,16 @@ void OSSIAControl::on_stop()
 {
     if(auto doc = currentDocument())
     {
-        auto& cstr = baseConstraint();
-        cstr.stop();
-        cstr.clear();
-        m_playing = false;
+
+        auto plugmodel = doc->model().pluginModel<OSSIADocumentPlugin>();
+        if(plugmodel && plugmodel->baseScenario())
+        {
+            auto& cstr = baseConstraint();
+            cstr.stop();
+            cstr.clear();
+            m_playing = false;
+            plugmodel->clear();
+        }
 
         // If we can we resume listening
         auto explorer = try_deviceExplorerFromObject(*doc);

diff --git a/base/plugins/iscore-plugin-ossia/OSSIAControl.hpp b/base/plugins/iscore-plugin-ossia/OSSIAControl.hpp
@@ -30,7 +30,6 @@ class OSSIAControl final : public iscore::PluginControlInterface
         void on_loadedDocument(iscore::Document* doc) override;
 
         OSSIAConstraintElement& baseConstraint() const;
-        OSSIABaseScenarioElement& baseScenario() const;
         std::shared_ptr<OSSIA::Device> localDevice() const
         { return m_localDevice; }
 

diff --git a/...score-plugin-scenario/Scenario/Document/Constraint/ViewModels/FullView/AddressBarItem.cpp b/...score-plugin-scenario/Scenario/Document/Constraint/ViewModels/FullView/AddressBarItem.cpp
@@ -72,7 +72,7 @@ void AddressBarItem::setTargetObject(ObjectPath && path)
 
 void AddressBarItem::on_elementClicked(ClickableLabelItem * clicked)
 {
-    int index = clicked->index();
+    std::size_t index = clicked->index();
 
     if(index < m_currentPath.vec().size())
     {