Added remaining settings.

Also fixed and improved some windowing stuff. The current window position can now be copied to the settings, so the window should be placed at this exact position on the next startup.

Author: kblaschke

src/ProjectMSDLApplication.cpp

@@ -165,6 +165,11 @@ void ProjectMSDLApplication::defineOptions(Poco::Util::OptionSet& options)
                              false, "<0/1>", true)
                           .binding("window.waitForVerticalSync", _commandLineOverrides));
 
+    options.addOption(Option("vsyncAdaptive", "",
+                             "If true and vsync is enabled, tries to use adaptive vsync. Set FPS to 0 for best results.",
+                             false, "<0/1>", true)
+                          .binding("window.adaptiveVerticalSync", _commandLineOverrides));
+
     options.addOption(Option("width", "", "Initial window width.",
                              false, "<number>", true)
                           .binding("window.width", _commandLineOverrides));

src/ProjectMWrapper.cpp

@@ -37,17 +37,24 @@ void ProjectMWrapper::initialize(Poco::Util::Application& app)
 
         _projectM = projectm_create();
 
+        int fps = _projectMConfigView->getInt("fps", 60);
+        if (fps <= 0)
+        {
+            // We don't know the target framerate, pass in a default of 60.
+            fps = 60;
+        }
+
         projectm_set_window_size(_projectM, canvasWidth, canvasHeight);
-        projectm_set_fps(_projectM, _projectMConfigView->getInt("fps", 60));
-        projectm_set_mesh_size(_projectM, _projectMConfigView->getInt("meshX", 220), _projectMConfigView->getInt("meshY", 125));
+        projectm_set_fps(_projectM, fps);
+        projectm_set_mesh_size(_projectM, _projectMConfigView->getInt("meshX", 48), _projectMConfigView->getInt("meshY", 32));
         projectm_set_aspect_correction(_projectM, _projectMConfigView->getBool("aspectCorrectionEnabled", true));
         projectm_set_preset_locked(_projectM, _projectMConfigView->getBool("presetLocked", false));
 
         // Preset display settings
-        projectm_set_preset_duration(_projectM, _projectMConfigView->getInt("displayDuration", 30));
-        projectm_set_soft_cut_duration(_projectM, _projectMConfigView->getInt("transitionDuration", 3));
+        projectm_set_preset_duration(_projectM, _projectMConfigView->getDouble("displayDuration", 30.0));
+        projectm_set_soft_cut_duration(_projectM, _projectMConfigView->getDouble("transitionDuration", 3.0));
         projectm_set_hard_cut_enabled(_projectM, _projectMConfigView->getBool("hardCutsEnabled", false));
-        projectm_set_hard_cut_duration(_projectM, _projectMConfigView->getInt("hardCutDuration", 20));
+        projectm_set_hard_cut_duration(_projectM, _projectMConfigView->getDouble("hardCutDuration", 20.0));
         projectm_set_hard_cut_sensitivity(_projectM, static_cast<float>(_projectMConfigView->getDouble("hardCutSensitivity", 1.0)));
         projectm_set_beat_sensitivity(_projectM, static_cast<float>(_projectMConfigView->getDouble("beatSensitivity", 1.0)));
 
@@ -81,7 +88,6 @@ void ProjectMWrapper::initialize(Poco::Util::Application& app)
                 // be sure what the link exactly points to, especially if a trailing slash is missing.
                 projectm_playlist_add_path(_playlist, presetPath.c_str(), true, false);
             }
-
         }
         projectm_playlist_sort(_playlist, 0, projectm_playlist_size(_playlist), SORT_PREDICATE_FILENAME_ONLY, SORT_ORDER_ASCENDING);
 
@@ -129,6 +135,11 @@ int ProjectMWrapper::TargetFPS()
     return _projectMConfigView->getInt("fps", 60);
 }
 
+void ProjectMWrapper::UpdateRealFPS(float fps)
+{
+    projectm_set_fps(_projectM, static_cast<uint32_t>(std::round(fps)));
+}
+
 void ProjectMWrapper::RenderFrame() const
 {
     glClearColor(0.0, 0.0, 0.0, 0.0);
@@ -250,12 +261,47 @@ void ProjectMWrapper::OnConfigurationPropertyRemoved(const std::string& key)
 
     if (key == "projectM.presetLocked")
     {
-        projectm_set_preset_locked(_projectM, _projectMConfigView->getBool("presetLocked"));
+        projectm_set_preset_locked(_projectM, _projectMConfigView->getBool("presetLocked", false));
         Poco::NotificationCenter::defaultCenter().postNotification(new UpdateWindowTitleNotification);
     }
 
     if (key == "projectM.shuffleEnabled")
     {
-        projectm_playlist_set_shuffle(_playlist, _projectMConfigView->getBool("shuffleEnabled"));
+        projectm_playlist_set_shuffle(_playlist, _projectMConfigView->getBool("shuffleEnabled", true));
+    }
+
+    if (key == "projectM.aspectCorrectionEnabled")
+    {
+        projectm_set_aspect_correction(_projectM, _projectMConfigView->getBool("aspectCorrectionEnabled", true));
+    }
+
+    if (key == "projectM.displayDuration")
+    {
+        projectm_set_preset_duration(_projectM, _projectMConfigView->getDouble("displayDuration", 30.0));
+    }
+
+    if (key == "projectM.transitionDuration")
+    {
+        projectm_set_soft_cut_duration(_projectM, _projectMConfigView->getDouble("transitionDuration", 3.0));
+    }
+
+    if (key == "projectM.hardCutsEnabled")
+    {
+        projectm_set_aspect_correction(_projectM, _projectMConfigView->getBool("hardCutsEnabled", false));
+    }
+
+    if (key == "projectM.hardCutDuration")
+    {
+        projectm_set_hard_cut_duration(_projectM, _projectMConfigView->getDouble("hardCutDuration", 20.0));
+    }
+
+    if (key == "projectM.hardCutSensitivity")
+    {
+        projectm_set_hard_cut_sensitivity(_projectM, static_cast<float>(_projectMConfigView->getDouble("hardCutSensitivity", 1.0)));
+    }
+
+    if (key == "projectM.meshX" || key == "projectM.meshY")
+    {
+        projectm_set_mesh_size(_projectM, _projectMConfigView->getUInt64("meshX", 48), _projectMConfigView->getUInt64("meshY", 32));
     }
 }

src/ProjectMWrapper.h

@@ -39,8 +39,18 @@ class ProjectMWrapper : public Poco::Util::Subsystem
      */
     void RenderFrame() const;
 
+    /**
+     * @brief Returns the targeted FPS value.
+     * @return The user-configured target FPS. Can be 0, which means unlimited.
+     */
     int TargetFPS();
 
+    /**
+     * @brief Updates projectM with the current, actual FPS value.
+     * @param fps The current FPS value.
+     */
+    void UpdateRealFPS(float fps);
+
     /**
      * @brief If splash is disabled, shows the initial preset.
      * If shuffle is on, a random preset will be picked. Otherwise, the first playlist item is displayed.

src/RenderLoop.cpp

@@ -23,7 +23,6 @@ RenderLoop::RenderLoop()
 void RenderLoop::Run()
 {
     FPSLimiter limiter;
-    limiter.TargetFPS(_projectMWrapper.TargetFPS());
 
     auto& notificationCenter{Poco::NotificationCenter::defaultCenter()};
 
@@ -33,6 +32,7 @@ void RenderLoop::Run()
 
     while (!_wantsToQuit)
     {
+        limiter.TargetFPS(_projectMWrapper.TargetFPS());
         limiter.StartFrame();
 
         PollEvents();
@@ -44,6 +44,9 @@ void RenderLoop::Run()
         _sdlRenderingWindow.Swap();
 
         limiter.EndFrame();
+
+        // Pass projectM the actual FPS value of the last frame.
+        _projectMWrapper.UpdateRealFPS(limiter.FPS());
     }
 
     notificationCenter.removeObserver(_quitNotificationObserver);