Code compilation fix

This commit is contained in:
Bruno Herbelin
2023-03-07 23:38:13 +01:00
parent 4c3c3de065
commit b8e0a9c1dd
11 changed files with 16 additions and 11 deletions

View File

@@ -1253,6 +1253,7 @@ std::string Control::inputLabel(uint id)
//
int Control::layoutKey(int key)
{
#if (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+
static int _keyMap[GLFW_KEY_LAST];
static bool _initialized = false;
if (!_initialized) {
@@ -1283,4 +1284,7 @@ int Control::layoutKey(int key)
// fprintf(stderr, "%d pressed; converted to %d\n", key, _keyMap[key]);
return _keyMap[key];
#else
return key;
#endif
}

View File

@@ -31,6 +31,7 @@
#include "imgui_internal.h"
#include "Log.h"
#include "ImageFilter.h"
#include "Mixer.h"
#include "defines.h"
#include "Source.h"

View File

@@ -3,13 +3,14 @@
#include "View.h"
struct WindowPreview
{
Group *root_;
Group *status_;
Surface *surface_;
Surface *render_;
ImageFilteringShader *shader_;
class ImageFilteringShader *shader_;
Switch *overlays_;
Switch *mode_;
Handles *handles_;

View File

@@ -2,7 +2,6 @@
#include "Resource.h"
#include "Visitor.h"
#include "FrameBufferFilter.h"
#include "FrameBufferFilter.h"
std::vector< std::tuple<int, int, std::string> > FrameBufferFilter::Types = {

View File

@@ -1119,8 +1119,12 @@ void ImGuiVisitor::visit (CloneSource& s)
// link to origin source
if ( !s.failed() ) {
std::string label = std::string(s.origin()->initials()) + " - " + s.origin()->name();
if (ImGui::Button(label.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) ))
if (ImGui::Button(label.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) )) {
Mixer::manager().setCurrentSource(s.origin());
if (UserInterface::manager().navigator.pannelVisible())
UserInterface::manager().navigator.showPannelSource( Mixer::manager().indexCurrentSource() );
}
ImGui::SameLine(0, IMGUI_SAME_LINE);
ImGui::Text("Origin");
}

View File

@@ -17,10 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
**/
#include "defines.h"
#include "Visitor.h"
#include "Log.h"
#include "ImageProcessingShader.h"
ShadingProgram imageProcessingShadingProgram("shaders/image.vs", "shaders/imageprocessing.fs");

View File

@@ -20,9 +20,6 @@
#include <glm/gtc/matrix_transform.hpp>
#include "defines.h"
#include "ImageShader.h"
#include "ImageProcessingShader.h"
#include "Resource.h"
#include "Decorations.h"
#include "MediaPlayer.h"

View File

@@ -5,6 +5,7 @@
#include <future>
#include "View.h"
#include "FrameBuffer.h"
class RenderView : public View
{

View File

@@ -8,6 +8,7 @@
#include <list>
#include "SourceList.h"
#include "FrameBuffer.h"
#include "View.h"
#define DEFAULT_MIXING_TRANSLATION -1.f, 1.f

View File

@@ -26,7 +26,6 @@
#include <sstream>
#include <regex>
#include "defines.h"
#include "Settings.h"
#include "Source.h"

View File

@@ -1,10 +1,11 @@
#ifndef VIEW_H
#define VIEW_H
#include <string>
#include <glm/glm.hpp>
#include "Scene.h"
#include "FrameBuffer.h"
class Session;
class SessionFileSource;