mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-11 18:34:58 +01:00
compilation OSX
This commit is contained in:
@@ -32,7 +32,7 @@ string GstToolkit::date_time_string()
|
||||
return oss.str();
|
||||
}
|
||||
|
||||
string GstToolkit::time_to_string(ulong t)
|
||||
string GstToolkit::time_to_string(guint64 t)
|
||||
{
|
||||
if (t == GST_CLOCK_TIME_NONE)
|
||||
return "00:00:00.00";
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef __GSTGUI_TOOLKIT_H_
|
||||
#define __GSTGUI_TOOLKIT_H_
|
||||
|
||||
#include <glibconfig.h>
|
||||
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
@@ -8,7 +10,7 @@ namespace GstToolkit
|
||||
{
|
||||
|
||||
std::string date_time_string();
|
||||
std::string time_to_string(ulong t);
|
||||
std::string time_to_string(guint64 t);
|
||||
|
||||
std::string gst_version();
|
||||
std::list<std::string> all_plugins();
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// Draw a Rectangle (triangle strip) with a texture
|
||||
class ImageSurface : public Primitive {
|
||||
|
||||
void deleteGLBuffers_() {}
|
||||
void deleteGLBuffers_() override {}
|
||||
|
||||
public:
|
||||
ImageSurface(const std::string& path = "" );
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
|
||||
class LineCircle : public LineStrip {
|
||||
|
||||
void deleteGLBuffers_() {}
|
||||
void deleteGLBuffers_() override {}
|
||||
|
||||
public:
|
||||
LineCircle(glm::vec3 color, uint linewidth = 1);
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
#ifdef __APPLE__
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
namespace Resource
|
||||
{
|
||||
|
||||
3
Scene.h
3
Scene.h
@@ -3,6 +3,9 @@
|
||||
|
||||
#define INVALID_ID -1
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@@ -50,7 +50,6 @@ void SessionVisitor::visit(Group &n)
|
||||
// revert to group as current
|
||||
xmlCurrent_ = group;
|
||||
}
|
||||
n.visible_;
|
||||
}
|
||||
|
||||
void SessionVisitor::visit(Switch &n)
|
||||
@@ -150,7 +149,7 @@ void SessionVisitor::visit(LineStrip &n)
|
||||
}
|
||||
}
|
||||
|
||||
void SessionVisitor::visit(LineSquare &n)
|
||||
void SessionVisitor::visit(LineSquare &)
|
||||
{
|
||||
// Node of a different type
|
||||
xmlCurrent_->SetAttribute("type", "LineSquare");
|
||||
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
void visit(ImageSurface& n) override;
|
||||
void visit(MediaSurface& n) override;
|
||||
void visit(LineStrip& n) override;
|
||||
void visit(LineSquare& n) override;
|
||||
void visit(LineSquare&) override;
|
||||
void visit(LineCircle& n) override;
|
||||
|
||||
// Elements with attributes
|
||||
|
||||
4
main.cpp
4
main.cpp
@@ -54,8 +54,8 @@
|
||||
///
|
||||
Scene scene;
|
||||
FrameBuffer *output;
|
||||
MediaSurface testnode1("file:///home/bhbn/Videos/iss.mov");
|
||||
MediaSurface testnode2("file:///home/bhbn/Videos/fish.mp4");
|
||||
MediaSurface testnode1("file:///Users/Herbelin/Movies/iss.mov");
|
||||
MediaSurface testnode2("file:///Users/Herbelin/Movies/mp2test.mpg");
|
||||
ImageSurface testnode3("images/v-mix_256x256.png");
|
||||
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ void tinyxml2::XMLElementToGLM(XMLElement *elem, glm::mat4 &matrix)
|
||||
}
|
||||
}
|
||||
|
||||
void tinyxml2::XMLCheckResult(uint r)
|
||||
void tinyxml2::XMLCheckResult(int r)
|
||||
{
|
||||
XMLError result = (XMLError) r;
|
||||
if ( result != XML_SUCCESS)
|
||||
|
||||
@@ -16,7 +16,7 @@ void XMLElementToGLM(XMLElement *elem, glm::vec3 &vector);
|
||||
void XMLElementToGLM(XMLElement *elem, glm::vec4 &vector);
|
||||
void XMLElementToGLM(XMLElement *elem, glm::mat4 &matrix);
|
||||
|
||||
void XMLCheckResult(uint r);
|
||||
void XMLCheckResult(int r);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user