Marker / Effects search

app.cpp

@@ -519,6 +519,10 @@ void LoadFile(std::string path) {
         return;
     }
 
+    // Force inspector to reload marker and effect lists
+    appState.active_tab->marker_filter_state.reload = true;
+    appState.active_tab->effect_filter_state.reload = true;
+
     appState.active_tab->file_path = path;
 
     auto end = std::chrono::high_resolution_clock::now();
@@ -622,7 +626,16 @@ bool IconButton(const char* label, const ImVec2 size = ImVec2(0, 0)) {
     return result;
 }
 
-void AppUpdate() { }
+void AppUpdate() {
+    // If something has happend that changed the active tabs state
+    // then handle any redraw/recalculation flags here
+    if (appState.active_tab && appState.active_tab->state_change) {
+        appState.active_tab->marker_filter_state.reload = true;
+        appState.active_tab->effect_filter_state.reload = true;
+
+        appState.active_tab->state_change = false;
+    }
+}
 
 void DrawRoot(otio::SerializableObjectWithMetadata* root) {
     if (!root){

app.h

@@ -7,6 +7,7 @@
 #include "imgui.h"
 #include "imgui_internal.h"
 
+#include <opentimelineio/marker.h>
 #include <opentimelineio/timeline.h>
 #include <opentimelineio/serializableObjectWithMetadata.h>
 namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
@@ -77,6 +78,36 @@ struct AppTheme {
     ImU32 colors[AppThemeCol_COUNT];
 };
 
+
+typedef std::pair<otio::SerializableObject::Retainer<otio::Marker>, 
+                  otio::SerializableObject::Retainer<otio::Item>> marker_parent_pair;
+
+// Store the state of the marker filter to save regenerating the list every frame
+// if the filter options haven't changed
+struct MarkerFilterState {
+    bool color_change;                     // Has the color combo box changed?
+    std::string filter_text = "";          // Text in filter box
+    bool name_check = true;                // State of filter by Name checkbox
+    bool item_check = false;               // State of filter by Item checkbox
+    std::vector<marker_parent_pair> pairs; // List of Markers the passed filtering
+    bool reload = false;                   // Trigger from loading a new file or state change
+    std::string filter_marker_color;       // Stores the selected color in the combo box
+};
+
+typedef std::pair<otio::SerializableObject::Retainer<otio::Effect>,
+                  otio::SerializableObject::Retainer<otio::Item>> effect_parent_pair;
+
+// Store the state of the effect filter to save regenerating the list every frame
+// if the filter options haven't changed
+struct EffectFilterState {
+    std::string filter_text = "";          // Text in filter box
+    bool reload = false;                   // Trigger from loading a new file or state change
+    bool name_check = true;                // State of filter by Name checkbox
+    bool item_check = false;               // State of filter by Item checkbox
+    bool effect_check = true;              // State of filter by Effect checkbox
+    std::vector<effect_parent_pair> pairs; //List of Effects that passed filtering
+};
+
 // Struct that holds data specific to individual tabs.
 struct TabData {
     // This holds the main Schema object. Pretty much everything drills into
@@ -93,6 +124,17 @@ struct TabData {
 
     bool first_frame = true;     // The timeline drawing code has to be drawn across
                                  // two frames so we keep track of that here
+
+    // Filter state
+    MarkerFilterState marker_filter_state; // Persistant state of Marker filtering
+    EffectFilterState effect_filter_state; // Persistant state of Effect filtering
+
+    // This should be set to true whenever something happens that changes to state
+    // of the tab. Then on the next draw loop we can check this and update things
+    // as required. See the Effects Inspector for an example. If set to true
+    // things are handled in AppUpdate() in app.c
+    // TODO: Could use to add a "file changed" indicator to the tab headers
+    bool state_change = false;
 };
 
 // Struct that holds the application's state

editing.cpp

@@ -12,6 +12,15 @@ void DeleteSelectedObject() {
         return;
     }
 
+    // Flag general state change
+    appState.active_tab->state_change = true;
+
+    // This function is called from DrawMenu() which is called before
+    // DrawInspector() in the main loop. THerefore we have to force update
+    // Marker and Filter redrawing here
+    appState.active_tab->marker_filter_state.reload = true;
+    appState.active_tab->effect_filter_state.reload = true;
+
     if (appState.selected_object == GetActiveRoot()) {
         CloseTab(appState.active_tab);
         return;
@@ -179,6 +188,9 @@ void AddMarkerAtPlayhead(otio::Item* item, std::string name, std::string color)
     otio::SerializableObject::Retainer<otio::Marker> marker = new otio::Marker(name, marked_range, color);
 
     item->markers().push_back(marker);
+
+    // Force Marker inpsector to redraw
+    appState.active_tab->marker_filter_state.reload = true;
 }
 
 void AddTrack(std::string kind) {