Add option to prevent sources from being added to default view automa…

…tically Signed-off-by: Ben Chamberland <[email protected]>
AcademySoftwareFoundation · Aug 23, 2024 · ed5819c · ed5819c
1 parent ceaf3df
commit ed5819c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/src/lib/app/RvApp/Options.cpp b/src/lib/app/RvApp/Options.cpp
@@ -458,6 +458,8 @@ Options::Options()
     presentFormat = (char*)"";
     presentData = (char*)"";
 
+    addSourceToDefaultView = true;
+
 #ifdef PLATFORM_DARWIN
     fontSize1 = 13;
     fontSize2 = 10;
@@ -493,6 +495,7 @@ Options::parseSourceArgs(const Files& inputFiles)
             inSource = true;
             sources.resize(sources.size() + 1);
             sources.back().singleSource = true;
+            sources.back().addSourceToDefaultView = true;
 
             SourceArgs& a = sources.back();
 

diff --git a/src/lib/app/RvApp/RvApp/Options.h b/src/lib/app/RvApp/RvApp/Options.h
@@ -34,8 +34,8 @@ struct Options
     {
         SourceArgs() : audioOffset(0), rangeOffset(0), volume(1), fps(0),
                        pixelAspect(0), stereoRelativeOffset(0), stereoRightOffset(0),
-                       hascrop(false), hasuncrop(false), singleSource (false),
-                       noMovieAudio(false)
+                       hascrop(false), hasuncrop(false), singleSource(false),
+                       noMovieAudio(false), addSourceToDefaultView(true)
             {
                 cutIn  = (std::numeric_limits<int>::max)();
                 cutOut = (std::numeric_limits<int>::max)();
@@ -59,6 +59,7 @@ struct Options
         float        stereoRightOffset;
         int          cutIn;
         int          cutOut;
+        bool         addSourceToDefaultView;
         std::string  fcdl;
         std::string  lcdl;
         std::string  flut;
@@ -341,6 +342,8 @@ struct Options
     int          fontSize1;
     int          fontSize2;
 
+    bool         addSourceToDefaultView;
+
     SendExternalEventVector  sendEvents;
 };
 

diff --git a/src/lib/app/RvApp/RvGraph.cpp b/src/lib/app/RvApp/RvGraph.cpp
@@ -324,7 +324,14 @@ RvGraph::connectNewSourcesToDefaultViews()
         copy(layer->inputs().begin(), layer->inputs().end(), inputs.begin());
         copy(m_newSources.begin(), m_newSources.end(), inputs.begin()+layer->inputs().size());
         HOP_ZONE( HOP_ZONE_COLOR_12 );
-        layer->setInputs(inputs);
+
+        if (Rv::Options::sharedOptions().addSourceToDefaultView)
+        {
+            layer->setInputs(inputs);
+        } else
+        {
+            cout << "INFO: Disabled adding sources to default views" << endl;
+        }
     }
 
     m_newSources.clear();

diff --git a/src/lib/app/RvCommon/MuUICommands.cpp b/src/lib/app/RvCommon/MuUICommands.cpp
@@ -609,6 +609,12 @@ void initUICommands()
                                       Return, "void",
                                       End),
 
+                         new Function(c, "setConnectNewSourcesToDefaultViews", setConnectNewSourcesToDefaultViews, None,
+                                      Return, "void",
+                                      Parameters,
+                                      new Param(c, "enable", "bool"),
+                                      End),
+
                          EndArguments);
 }
 
@@ -2335,4 +2341,10 @@ NODE_IMPLEMENTATION(rvioSetup, void)
     // backward compatibility.
 }
 
+NODE_IMPLEMENTATION(setConnectNewSourcesToDefaultViews, void)
+{
+    bool enable = NODE_ARG(0, bool);
+    Rv::Options::sharedOptions().addSourceToDefaultView = enable;
+}
+
 } // Rv namespace
diff --git a/src/lib/app/RvCommon/RvCommon/MuUICommands.h b/src/lib/app/RvCommon/RvCommon/MuUICommands.h
@@ -88,6 +88,7 @@ NODE_DECLARATION(validateShotgunToken, Mu::Pointer);
 NODE_DECLARATION(launchTLI, void);
 NODE_DECLARATION(rvioSetup, void);
 NODE_DECLARATION(javascriptMuExport, void);
+NODE_DECLARATION(setConnectNewSourcesToDefaultViews, void);
 
 
 } // Rv