Added a simple settings window and a preset chooser dialog.

Author: kblaschke

src/CMakeLists.txt

@@ -15,6 +15,8 @@ add_executable(projectMSDL WIN32
         AudioCapture.h
         FPSLimiter.cpp
         FPSLimiter.h
+        GuiFileChooserWindow.cpp
+        GuiFileChooserWindow.h
         PresetSelectionGui.cpp
         PresetSelectionGui.h
         ProjectMSDLApplication.cpp

src/GuiFileChooserWindow.cpp

@@ -0,0 +1,154 @@
+#include "GuiFileChooserWindow.h"
+
+#include "imgui.h"
+
+#include <Poco/SortedDirectoryIterator.h>
+#include <Poco/String.h>
+
+void GuiFileChooserWindow::Show()
+{
+    _visible = true;
+}
+
+bool GuiFileChooserWindow::Draw()
+{
+    if (!_visible)
+    {
+        return false;
+    }
+
+    bool fileSelected{false};
+
+    if (!_currentDir.isDirectory() || !Poco::File(_currentDir).exists())
+    {
+        _currentDir = Poco::Path::home();
+    }
+
+    if (ImGui::Begin("Load Preset", &_visible), ImGuiWindowFlags_NoCollapse)
+    {
+        DrawNavButtons();
+
+        ImGui::Separator();
+
+        ImGui::Text("%s", _currentDir.toString().c_str());
+
+        if (ImGui::BeginListBox("##filelist", ImVec2(-1,-1)))
+        {
+            Poco::SortedDirectoryIterator directoryIterator(_currentDir);
+            Poco::SortedDirectoryIterator directoryEnd;
+
+            int index = 0;
+            while (directoryIterator != directoryEnd)
+            {
+                bool isSelected = _selectedFileIndex == index;
+                bool isDirectory = false;
+                bool isHidden = false;
+                try
+                {
+                    // This will throw for broken symlinks or if the file/dir isn't accessible
+                    isHidden = directoryIterator->isHidden();
+                    isDirectory = directoryIterator->isDirectory();
+                }
+                catch (...)
+                {
+                }
+
+                if (!_showhidden && isHidden)
+                {
+                    ++directoryIterator;
+                    continue;
+                }
+
+                auto filename = directoryIterator.name();
+
+                if (isDirectory)
+                {
+                    filename.append("/");
+                }
+                else
+                {
+                    if (Poco::icompare(directoryIterator.path().getExtension(), "milk") != 0)
+                    {
+                        ++directoryIterator;
+                        continue;
+                    }
+                }
+
+                if (ImGui::Selectable(filename.c_str(), isSelected, ImGuiSelectableFlags_AllowDoubleClick))
+                {
+                    _selectedFileIndex = index;
+
+                    if (ImGui::IsMouseDoubleClicked(0))
+                    {
+                        if (isDirectory)
+                        {
+                            _currentDir = directoryIterator.path();
+                            _currentDir.makeDirectory();
+                            poco_debug_f1(_logger, "Changing dir to: %s", _currentDir.toString());
+                        }
+                        else
+                        {
+                            _selectedFile = directoryIterator.path();
+                            poco_debug_f1(_logger, "User selected file: %s", _selectedFile.path());
+                            fileSelected = true;
+                            _visible = false;
+                        }
+                    }
+                }
+
+                ++directoryIterator;
+                index++;
+            }
+
+            ImGui::EndListBox();
+        }
+    }
+    else
+    {
+        _visible = false;
+    }
+
+    ImGui::End();
+
+    return fileSelected;
+}
+void GuiFileChooserWindow::DrawNavButtons()
+{
+    ImGui::Checkbox("Show hidden files", &_showhidden);
+
+    // Root path buttons first
+    std::vector<std::string> roots;
+    Poco::Path::listRoots(roots);
+
+    if (ImGui::Button("Up"))
+    {
+        _currentDir = _currentDir.parent();
+        _currentDir.makeDirectory();
+        poco_debug_f1(_logger, "Going one dir up: %s", _currentDir.toString());
+    }
+
+    ImGui::SameLine();
+
+    if (ImGui::Button("Home"))
+        {
+            _currentDir = Poco::Path::home();
+            poco_debug_f1(_logger, "Going to user's home dir: %s", _currentDir.toString());
+        }
+
+        for (const auto& root: roots)
+        {
+            ImGui::SameLine();
+
+            if (ImGui::Button(root.c_str()))
+            {
+                _currentDir = root;
+
+                poco_debug_f1(_logger, "Changing root/drive to: %s", _currentDir.toString());
+            }
+        }
+}
+
+const Poco::File& GuiFileChooserWindow::SelectedFile() const
+{
+    return _selectedFile;
+}

src/GuiFileChooserWindow.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <Poco/File.h>
+#include <Poco/Path.h>
+#include <Poco/Logger.h>
+
+class GuiFileChooserWindow
+{
+public:
+
+    void Show();
+
+    /**
+     * @brief Draws the dialog and returns if the user chose a file.
+     * @return True if the user chose a file, false if not.
+     */
+    bool Draw();
+
+    const Poco::File& SelectedFile() const;
+
+protected:
+    void DrawNavButtons();
+
+    bool _visible{ false }; //!< File chooser window visible.
+    bool _showhidden{ false }; //!< If true, hidden files/dirs are shown.
+    Poco::Path _currentDir{ Poco::Path::current() }; //!< Current working dir.
+    Poco::File _selectedFile; //!< Currently selected file.
+    int _selectedFileIndex{ 0 }; //!< Currently selected item in the file list.
+
+    Poco::Logger& _logger{ Poco::Logger::get("GuiFileChooserWindow") };
+};

src/PresetSelectionGui.cpp

@@ -22,7 +22,7 @@ void PresetSelectionGui::initialize(Poco::Util::Application& app)
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO();
-    (void)io;
+    (void) io;
 
     ImGui::StyleColorsDark();
 
@@ -91,46 +91,43 @@ void PresetSelectionGui::UpdateFontSize()
 void PresetSelectionGui::ProcessInput(const SDL_Event& event)
 {
     ImGui_ImplSDL2_ProcessEvent(&event);
+    unsigned int position;
+    projectm_get_selected_preset_index(_projectMWrapper->ProjectM(), &position);
+    _playlistPosition = static_cast<int>(position);
+    _playlistSize = projectm_get_playlist_size(_projectMWrapper->ProjectM());
 }
 
 void PresetSelectionGui::Draw()
 {
-    ImGui_ImplOpenGL3_NewFrame();
     ImGui_ImplSDL2_NewFrame();
+    ImGui_ImplOpenGL3_NewFrame();
     ImGui::NewFrame();
 
+    if (_settingsVisible)
     {
-        static float f = 0.0f;
-        static int counter = 0;
+        DrawSettingsWindow();
 
-        ImGui::Begin("Hello, world!");                          // Create a window called "Hello, world!" and append into it.
+    }
 
-        ImGui::Text("This is some useful text.");               // Display some text (you can use a format strings too)
+    try {
 
-        ImGui::SliderFloat("float", &f, 0.0f, 1.0f);            // Edit 1 float using a slider from 0.0f to 1.0f
+        if (_fileChooser.Draw())
+        {
+            // Preset selected, load & switch.
+            std::string presetName = Poco::Path(_fileChooser.SelectedFile().path()).getFileName();
 
-        if (ImGui::Button("Button"))                            // Buttons return true when clicked (most widgets return true when edited/activated)
-            counter++;
-        ImGui::SameLine();
-        ImGui::Text("counter = %d", counter);
+            int ratingList[2]{};
+            projectm_add_preset_url(_projectMWrapper->ProjectM(),
+                                    _fileChooser.SelectedFile().path().c_str(),
+                                    presetName.c_str(),
+                                    &ratingList[0], 2);
+            projectm_select_preset(_projectMWrapper->ProjectM(), projectm_get_playlist_size(_projectMWrapper->ProjectM()) - 1, true);
+        }
 
-        ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
-
-        static char text[1024 * 16] =
-            "/*\n"
-            " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n"
-            " the hexadecimal encoding of one offending instruction,\n"
-            " more formally, the invalid operand with locked CMPXCHG8B\n"
-            " instruction bug, is a design flaw in the majority of\n"
-            " Intel Pentium, Pentium MMX, and Pentium OverDrive\n"
-            " processors (all in the P5 microarchitecture).\n"
-            "*/\n\n"
-            "label:\n"
-            "\tlock cmpxchg8b eax\n";
-
-        ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16), ImGuiInputTextFlags_None);
-
-        ImGui::End();
+    }
+    catch(Poco::Exception& ex)
+    {
+        poco_error_f1(_logger, "Exception in file chooser: %s", ex.message());
     }
 
     ImGui::Render();
@@ -148,3 +145,47 @@ bool PresetSelectionGui::WantsMouseInput()
     auto& io = ImGui::GetIO();
     return io.WantCaptureMouse;
 }
+
+void PresetSelectionGui::DrawSettingsWindow()
+{
+    if (ImGui::Begin("projectM Settings", &_settingsVisible))
+    {
+        ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Hint:");
+        ImGui::SameLine();
+        ImGui::Text("Press <TAB> after clicking on a slider to enter a custom value.");
+
+        if (ImGui::SliderFloat("Preset Display Duration", &_displayDuration, 1.0f, 60.0f))
+        {
+            projectm_set_preset_duration(_projectMWrapper->ProjectM(), _displayDuration);
+        }
+
+        if (ImGui::SliderInt("Playlist Position", &_playlistPosition, 0, _playlistSize - 1))
+        {
+            projectm_select_preset(_projectMWrapper->ProjectM(), _playlistPosition, true);
+        }
+
+
+        ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
+
+        if (ImGui::Button("Toggle Fullscreen"))
+        {
+            _sdlRenderingWindow->ToggleFullscreen();
+        }
+
+        ImGui::SameLine();
+
+        if (ImGui::Button("Random Preset"))
+        {
+            projectm_select_random_preset(_projectMWrapper->ProjectM(), true);
+        }
+
+        ImGui::SameLine();
+
+        if (ImGui::Button("Load Preset..."))
+        {
+            _fileChooser.Show();
+        }
+
+    }
+    ImGui::End();
+}

src/PresetSelectionGui.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "GuiFileChooserWindow.h"
+
 #include <SDL2/SDL.h>
 
 #include <Poco/Logger.h>
@@ -31,14 +33,24 @@ class PresetSelectionGui : public Poco::Util::Subsystem
     bool WantsMouseInput();
 
 protected:
+    void DrawSettingsWindow();
+
+    ProjectMWrapper* _projectMWrapper{ nullptr };
+    SDLRenderingWindow* _sdlRenderingWindow{ nullptr };
 
     SDL_Window* _renderingWindow{ nullptr }; //!< Pointer to the SDL window used for rendering.
     SDL_GLContext _glContext{ nullptr }; //!< Pointer to the OpenGL context associated with the window.
     ImFont* _font{ nullptr }; //!< Currently loaded UI font.
 
     float _dpi{ 0.0f }; //!< Last DPI value.
 
-    Poco::Logger& _logger{ Poco::Logger::get("PresetSelectionGui") }; //!< The class logger.
+    GuiFileChooserWindow _fileChooser; //!< File chooser dialog.
 
+    bool _settingsVisible{ true }; //!< Flag for settings window visibility.
+    float _displayDuration{ 0.0f }; //!< Preset display time
+    int _playlistPosition{ 0 }; //!< Playlist position
+    int _playlistSize{ 0 }; //!< Playlist size
+
+    Poco::Logger& _logger{ Poco::Logger::get("PresetSelectionGui") }; //!< The class logger.
 
 };