Refactored session functions to session namespace.

ggarra13 · Oct 12, 2023 · 79318da · 79318da
1 parent 596ba86
commit 79318da
Show file tree

Hide file tree

Showing 6 changed files with 500 additions and 485 deletions.
diff --git a/mrv2/lib/mrvApp/App.cpp b/mrv2/lib/mrvApp/App.cpp
@@ -956,7 +956,7 @@ namespace mrv
             fileName.substr(fileName.size() - 6, fileName.size()) == ".mrv2s")
         {
             p.session = true;
-            load_session(fileName);
+            session::load(fileName);
             return;
         }
 

diff --git a/mrv2/lib/mrvFl/mrvCallbacks.cpp b/mrv2/lib/mrvFl/mrvCallbacks.cpp
@@ -1661,7 +1661,7 @@ namespace mrv
                 return;
         }
 
-        if (save_session(file))
+        if (session::save(file))
         {
             auto settingsObject = ui->app->settingsObject();
             settingsObject->addRecentFile(file);
@@ -1678,12 +1678,12 @@ namespace mrv
 
         save_session_impl(file, ui);
 
-        set_current_session(file);
+        session::setCurrent(file);
     }
 
     void save_session_cb(Fl_Menu_* m, ViewerUI* ui)
     {
-        const std::string file = current_session();
+        const std::string file = session::current();
         if (file.empty())
             return save_session_as_cb(m, ui);
 
@@ -1696,7 +1696,7 @@ namespace mrv
         if (file.empty())
             return;
 
-        if (load_session(file))
+        if (session::load(file))
         {
             auto settingsObject = ui->app->settingsObject();
             settingsObject->addRecentFile(file);