From dbc51f2ed4df454cc9d6afa10eeec3fac458e151 Mon Sep 17 00:00:00 2001
From: brunoherbelin <herbelin@Brunos-MacBook-Pro.local>
Date: Mon, 6 Apr 2020 13:26:38 +0200
Subject: [PATCH] compilation OSX

---
 GstToolkit.cpp      | 2 +-
 GstToolkit.h        | 4 +++-
 Primitives.h        | 4 ++--
 Resource.h          | 3 +++
 Scene.h             | 3 +++
 SessionVisitor.cpp  | 3 +--
 SessionVisitor.h    | 2 +-
 main.cpp            | 4 ++--
 tinyxml2Toolkit.cpp | 2 +-
 tinyxml2Toolkit.h   | 2 +-
 10 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/GstToolkit.cpp b/GstToolkit.cpp
index c676f9b..13222ba 100644
--- a/GstToolkit.cpp
+++ b/GstToolkit.cpp
@@ -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";
diff --git a/GstToolkit.h b/GstToolkit.h
index 9beea14..f571e12 100644
--- a/GstToolkit.h
+++ b/GstToolkit.h
@@ -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();
diff --git a/Primitives.h b/Primitives.h
index 18e4238..36736b7 100644
--- a/Primitives.h
+++ b/Primitives.h
@@ -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);
diff --git a/Resource.h b/Resource.h
index 6b54925..5c8b17c 100644
--- a/Resource.h
+++ b/Resource.h
@@ -3,6 +3,9 @@
 
 #include <string>
 #include <map>
+#ifdef __APPLE__
+#include <sys/types.h>
+#endif
 
 namespace Resource
 {
diff --git a/Scene.h b/Scene.h
index 0189066..12eb605 100644
--- a/Scene.h
+++ b/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>
diff --git a/SessionVisitor.cpp b/SessionVisitor.cpp
index dd45d9c..86c1e62 100644
--- a/SessionVisitor.cpp
+++ b/SessionVisitor.cpp
@@ -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");
diff --git a/SessionVisitor.h b/SessionVisitor.h
index ae60850..5d8ae8b 100644
--- a/SessionVisitor.h
+++ b/SessionVisitor.h
@@ -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
diff --git a/main.cpp b/main.cpp
index 950a0bb..c260cb4 100644
--- a/main.cpp
+++ b/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");
 
 
diff --git a/tinyxml2Toolkit.cpp b/tinyxml2Toolkit.cpp
index 5bf31d2..12d2a23 100644
--- a/tinyxml2Toolkit.cpp
+++ b/tinyxml2Toolkit.cpp
@@ -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)
diff --git a/tinyxml2Toolkit.h b/tinyxml2Toolkit.h
index bff8ddb..7d12dc8 100644
--- a/tinyxml2Toolkit.h
+++ b/tinyxml2Toolkit.h
@@ -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);
 
 }