mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-18 21:59:58 +01:00
Code compilation fix
This commit is contained in:
@@ -1253,6 +1253,7 @@ std::string Control::inputLabel(uint id)
|
|||||||
//
|
//
|
||||||
int Control::layoutKey(int key)
|
int Control::layoutKey(int key)
|
||||||
{
|
{
|
||||||
|
#if (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+
|
||||||
static int _keyMap[GLFW_KEY_LAST];
|
static int _keyMap[GLFW_KEY_LAST];
|
||||||
static bool _initialized = false;
|
static bool _initialized = false;
|
||||||
if (!_initialized) {
|
if (!_initialized) {
|
||||||
@@ -1283,4 +1284,7 @@ int Control::layoutKey(int key)
|
|||||||
|
|
||||||
// fprintf(stderr, "%d pressed; converted to %d\n", key, _keyMap[key]);
|
// fprintf(stderr, "%d pressed; converted to %d\n", key, _keyMap[key]);
|
||||||
return _keyMap[key];
|
return _keyMap[key];
|
||||||
|
#else
|
||||||
|
return key;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
#include "imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
|
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
#include "ImageFilter.h"
|
||||||
#include "Mixer.h"
|
#include "Mixer.h"
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
#include "Source.h"
|
#include "Source.h"
|
||||||
|
|||||||
@@ -3,13 +3,14 @@
|
|||||||
|
|
||||||
#include "View.h"
|
#include "View.h"
|
||||||
|
|
||||||
|
|
||||||
struct WindowPreview
|
struct WindowPreview
|
||||||
{
|
{
|
||||||
Group *root_;
|
Group *root_;
|
||||||
Group *status_;
|
Group *status_;
|
||||||
Surface *surface_;
|
Surface *surface_;
|
||||||
Surface *render_;
|
Surface *render_;
|
||||||
ImageFilteringShader *shader_;
|
class ImageFilteringShader *shader_;
|
||||||
Switch *overlays_;
|
Switch *overlays_;
|
||||||
Switch *mode_;
|
Switch *mode_;
|
||||||
Handles *handles_;
|
Handles *handles_;
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
#include "Resource.h"
|
#include "Resource.h"
|
||||||
#include "Visitor.h"
|
#include "Visitor.h"
|
||||||
|
|
||||||
#include "FrameBufferFilter.h"
|
|
||||||
#include "FrameBufferFilter.h"
|
#include "FrameBufferFilter.h"
|
||||||
|
|
||||||
std::vector< std::tuple<int, int, std::string> > FrameBufferFilter::Types = {
|
std::vector< std::tuple<int, int, std::string> > FrameBufferFilter::Types = {
|
||||||
|
|||||||
@@ -1119,8 +1119,12 @@ void ImGuiVisitor::visit (CloneSource& s)
|
|||||||
// link to origin source
|
// link to origin source
|
||||||
if ( !s.failed() ) {
|
if ( !s.failed() ) {
|
||||||
std::string label = std::string(s.origin()->initials()) + " - " + s.origin()->name();
|
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());
|
Mixer::manager().setCurrentSource(s.origin());
|
||||||
|
|
||||||
|
if (UserInterface::manager().navigator.pannelVisible())
|
||||||
|
UserInterface::manager().navigator.showPannelSource( Mixer::manager().indexCurrentSource() );
|
||||||
|
}
|
||||||
ImGui::SameLine(0, IMGUI_SAME_LINE);
|
ImGui::SameLine(0, IMGUI_SAME_LINE);
|
||||||
ImGui::Text("Origin");
|
ImGui::Text("Origin");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,10 +17,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#include "defines.h"
|
|
||||||
#include "Visitor.h"
|
#include "Visitor.h"
|
||||||
#include "Log.h"
|
|
||||||
|
|
||||||
#include "ImageProcessingShader.h"
|
#include "ImageProcessingShader.h"
|
||||||
|
|
||||||
ShadingProgram imageProcessingShadingProgram("shaders/image.vs", "shaders/imageprocessing.fs");
|
ShadingProgram imageProcessingShadingProgram("shaders/image.vs", "shaders/imageprocessing.fs");
|
||||||
|
|||||||
@@ -20,9 +20,6 @@
|
|||||||
|
|
||||||
#include <glm/gtc/matrix_transform.hpp>
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
|
|
||||||
#include "defines.h"
|
|
||||||
#include "ImageShader.h"
|
|
||||||
#include "ImageProcessingShader.h"
|
|
||||||
#include "Resource.h"
|
#include "Resource.h"
|
||||||
#include "Decorations.h"
|
#include "Decorations.h"
|
||||||
#include "MediaPlayer.h"
|
#include "MediaPlayer.h"
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include <future>
|
#include <future>
|
||||||
|
|
||||||
#include "View.h"
|
#include "View.h"
|
||||||
|
#include "FrameBuffer.h"
|
||||||
|
|
||||||
class RenderView : public View
|
class RenderView : public View
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include "SourceList.h"
|
#include "SourceList.h"
|
||||||
|
#include "FrameBuffer.h"
|
||||||
#include "View.h"
|
#include "View.h"
|
||||||
|
|
||||||
#define DEFAULT_MIXING_TRANSLATION -1.f, 1.f
|
#define DEFAULT_MIXING_TRANSLATION -1.f, 1.f
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
|
||||||
|
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
#include "Settings.h"
|
#include "Settings.h"
|
||||||
#include "Source.h"
|
#include "Source.h"
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
#ifndef VIEW_H
|
#ifndef VIEW_H
|
||||||
#define VIEW_H
|
#define VIEW_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
#include "Scene.h"
|
#include "Scene.h"
|
||||||
#include "FrameBuffer.h"
|
|
||||||
|
|
||||||
class Session;
|
class Session;
|
||||||
class SessionFileSource;
|
class SessionFileSource;
|
||||||
|
|||||||
Reference in New Issue
Block a user