Updated network commands.

ggarra13 · Apr 20, 2024 · be190c6 · be190c6
1 parent fe1da2c
commit be190c6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -12,6 +12,7 @@ v1.1.3
 - Added instructions on Windows on how to retrieve the Explorer thumbnails.
 - Darby has been busy!  He added automatic scrolling of the timeline when
   playing and ability to toggle track and clip info.
+- Added Darby's new options to Network connections.
 - New action icons, which should display properly at high resolutions.
 - Sped up comparison wipes with Alt and Shift dragging.
 - Sped up color corrections from the Color Panel.

diff --git a/mrv2/lib/mrvFl/mrvCallbacks.cpp b/mrv2/lib/mrvFl/mrvCallbacks.cpp
@@ -1605,6 +1605,10 @@ namespace mrv
 
     void timeline_frame_view_cb(Fl_Menu_* m, ViewerUI* ui)
     {
+        Message msg;
+        msg["command"] = "Timeline/FrameView";
+        if (ui->uiPrefs->SendUI->value())
+            tcp->pushMessage(msg);
         ui->uiTimeline->frameView();
         ui->uiMain->fill_menu(ui->uiMenuBar);
     }
@@ -1614,6 +1618,11 @@ namespace mrv
         Fl_Menu_Item* item = const_cast< Fl_Menu_Item* >(m->mvalue());
         bool value = item->checked();
         auto settings = ui->app->settings();
+        Message msg;
+        msg["command"] = "Timeline/ScrollToCurrentFrame";
+        msg["value"] = value;
+        if (ui->uiPrefs->SendUI->value())
+            tcp->pushMessage(msg);
         settings->setValue("Timeline/ScrollToCurrentFrame", value);
         ui->uiTimeline->setScrollToCurrentFrame(value);
         ui->uiMain->fill_menu(ui->uiMenuBar);

diff --git a/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp b/mrv2/lib/mrvNetwork/mrvCommandInterpreter.cpp
@@ -1298,6 +1298,27 @@ namespace mrv
                 timelineui::ItemOptions value = message["value"];
                 ui->uiTimeline->setItemOptions(value);
             }
+            else if (c == "Timeline/FrameView")
+            {
+                bool receive = prefs->ReceiveUI->value();
+                if (!receive)
+                {
+                    tcp->unlock();
+                    return;
+                }
+                ui->uiTimeline->frameView();
+            }
+            else if (c == "Timeline/ScrollToCurrentFrame")
+            {
+                bool receive = prefs->ReceiveUI->value();
+                if (!receive)
+                {
+                    tcp->unlock();
+                    return;
+                }
+                bool value = message["value"];
+                ui->uiTimeline->setScrollToCurrentFrame(value);
+            }
             else if (c == "setTimelineEditable")
             {
                 bool receive = prefs->ReceiveUI->value();