Renamed ocio:: combine and split view functions

ggarra13 · Sep 10, 2024 · 74e7efb · 74e7efb
1 parent b1d0ef6
commit 74e7efb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/src/lib/mrvApp/mrvApp.cpp b/src/lib/mrvApp/mrvApp.cpp
@@ -857,7 +857,7 @@ namespace mrv
             { 
                 if (!p.options.ocioOptions.view.empty())
                 {
-                    const std::string& merged = ocio::displayViewShortened(
+                    const std::string& merged = ocio::combineView(
                         p.options.ocioOptions.display,
                         p.options.ocioOptions.view);
                     ocio::setView(merged);

diff --git a/src/lib/mrvFl/mrvCallbacks.cpp b/src/lib/mrvFl/mrvCallbacks.cpp
@@ -1526,7 +1526,7 @@ namespace mrv
 
         // Split combined display/view into separate parts.
         timeline::OCIOOptions o;
-        ocio::splitViewIntoDisplayView(combined, o.display, o.view);
+        ocio::splitView(combined, o.display, o.view);
         if (numMonitors == 1)
         {
             // If only one monitor, update main UI.
@@ -1566,7 +1566,7 @@ namespace mrv
         {
             // Split combined display/view into separate parts.
             timeline::OCIOOptions o;
-            ocio::splitViewIntoDisplayView(combined, o.display, o.view);
+            ocio::splitView(combined, o.display, o.view);
             ui->uiView->setOCIOOptions(i, o);
         }
 

diff --git a/src/lib/mrvFl/mrvOCIO.cpp b/src/lib/mrvFl/mrvOCIO.cpp
@@ -256,7 +256,7 @@ namespace mrv
             {
                 // Set the default ocio display/view as found in config.ocio
                 // file.
-                display_view = displayViewShortened(defaultDisplay,
+                display_view = combineView(defaultDisplay,
                                                     defaultView);
             }
 
@@ -681,7 +681,7 @@ namespace mrv
             uiOCIOView->do_callback();
         }
 
-        std::string displayViewShortened(
+        std::string combineView(
             const std::string& display, const std::string& view)
         {
             if (display.empty() || view.empty() || view == kInactive)
@@ -712,7 +712,7 @@ namespace mrv
             return out;
         }
 
-        void splitViewIntoDisplayView(
+        void splitView(
             const std::string& combined, std::string& display,
             std::string& view)
         {
@@ -846,7 +846,7 @@ namespace mrv
                         .arg(display);
                 throw std::runtime_error(err);
             }
-            auto display_view = displayViewShortened(display, defaultView);
+            auto display_view = combineView(display, defaultView);
             setView(display_view);
         }
 
@@ -1002,7 +1002,7 @@ namespace mrv
                     setConfig(ocio.fileName);
                     setIcs(ocio.input);
                     std::string view =
-                        displayViewShortened(ocio.display, ocio.view);
+                        combineView(ocio.display, ocio.view);
                     setView(view);
                     setLook(ocio.look);
 
@@ -1046,7 +1046,7 @@ namespace mrv
 
             std::string display, view;
             std::string combined = ocio::view();
-            splitViewIntoDisplayView(combined, display, view);
+            splitView(combined, display, view);
 
             ocio.display = display;
             ocio.view = view;

diff --git a/src/lib/mrvFl/mrvOCIO.h b/src/lib/mrvFl/mrvOCIO.h
@@ -36,10 +36,11 @@ namespace mrv
         void setLook(const std::string&);
 
         //! Given a display and view, return mrv2's merged display view format
-        std::string displayViewShortened(
+        std::string combineView(
             const std::string& display, const std::string& view);
 
-        void splitViewIntoDisplayView(
+        //! Given a combined (display/view) return separate display and view.
+        void splitView(
             const std::string& combined, std::string& display,
             std::string& view);
 

diff --git a/src/lib/mrvGL/mrvTimelineViewport.cpp b/src/lib/mrvGL/mrvTimelineViewport.cpp
@@ -2000,7 +2000,7 @@ namespace mrv
         if (viewIndex >= 0)
         {
             const std::string& combined = ocio::view();
-            ocio::splitViewIntoDisplayView(combined, o.display, o.view);
+            ocio::splitView(combined, o.display, o.view);
         }
 
         std::string look = p.ui->uiOCIOLook->label();
@@ -2414,7 +2414,7 @@ namespace mrv
         {
             p.previous_screen = screen;
             const std::string& combined =
-                ocio::displayViewShortened(o.display, o.view);
+                ocio::combineView(o.display, o.view);
             p.ui->uiOCIOView->copy_label(combined.c_str());
         }
     }

diff --git a/src/lib/mrvNetwork/mrvCommandInterpreter.cpp b/src/lib/mrvNetwork/mrvCommandInterpreter.cpp
@@ -518,7 +518,7 @@ namespace mrv
                 ui->uiICS->value(index);
 
                 std::string mergedView =
-                    ocio::displayViewShortened(o.display, o.view);
+                    ocio::combineView(o.display, o.view);
                 index = ocio::viewIndex(mergedView);
                 ui->uiOCIOView->value(index);
 

diff --git a/src/lib/mrvUI/mrvMenus.cpp b/src/lib/mrvUI/mrvMenus.cpp
@@ -1394,7 +1394,7 @@ namespace mrv
         {
             const timeline::OCIOOptions& o = uiView->getOCIOOptions(0);
             std::string combined =
-                ocio::displayViewShortened(o.display, o.view);
+                ocio::combineView(o.display, o.view);
 
             for (int i = 0; i < ui->uiOCIOView->children(); ++i)
             {
@@ -1433,7 +1433,7 @@ namespace mrv
             const timeline::OCIOOptions& o = uiView->getOCIOOptions(m);
             std::string monitorName = mrv::desktop::monitorName(m);
             std::string combined =
-                ocio::displayViewShortened(o.display, o.view);
+                ocio::combineView(o.display, o.view);
             combined = monitorName + "/" + combined;
 
             for (int i = 0; i < ui->uiOCIOView->children(); ++i)