Merge remote-tracking branch 'origin/master' into beta

CMakeLists.txt

@@ -61,11 +61,11 @@ if(UNIX)
         set(CMAKE_SKIP_RPATH TRUE)
         set(OpenGL_DIR /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/)
 
-        set(CMAKE_OSX_ARCHITECTURES "x86_64")
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11")
+        # set(CMAKE_OSX_ARCHITECTURES "x86_64")
+        # set(CMAKE_OSX_DEPLOYMENT_TARGET "11")
 
-#        set(CMAKE_OSX_ARCHITECTURES "arm64")
-#        set(CMAKE_OSX_DEPLOYMENT_TARGET "12")
+       set(CMAKE_OSX_ARCHITECTURES "arm64")
+       set(CMAKE_OSX_DEPLOYMENT_TARGET "13")
 
         # CPACK
         set(CPACK_SYSTEM_NAME  "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}")

src/Connection.cpp

@@ -21,6 +21,9 @@
 #include <chrono>
 #include <algorithm>
 
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "defines.h"

src/ControlManager.cpp

@@ -25,6 +25,9 @@
 #include <regex>
 
 #include <GLFW/glfw3.h>
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "Log.h"

src/MediaPlayer.cpp

@@ -479,7 +479,6 @@ void MediaPlayer::execute_open()
     Rendering::LinkPipeline(GST_PIPELINE (pipeline_));
 #endif
 
-
     // set to desired state (PLAY or PAUSE)
     GstStateChangeReturn ret = gst_element_set_state (pipeline_, desired_state_);
     if (ret == GST_STATE_CHANGE_FAILURE) {
@@ -1741,16 +1740,30 @@ void MediaPlayer::setAudioEnabled(bool on)
 
 void MediaPlayer::setAudioVolume(float vol)
 {
-    if (pipeline_ && media_.hasaudio)
-        g_object_set(G_OBJECT(pipeline_), "volume", vol, NULL);
+    if (pipeline_ && media_.hasaudio){
+
+        GstElement *asink = NULL;
+        g_object_get (G_OBJECT (pipeline_), "audio-sink", &asink, NULL);
+        if ( asink )
+            g_object_set(G_OBJECT(asink), "volume", vol, NULL);
+        else
+            g_object_set(G_OBJECT(pipeline_), "volume", vol, NULL);
+
+    }
         //        gst_stream_volume_set_volume (GST_STREAM_VOLUME (pipeline_), GST_STREAM_VOLUME_FORMAT_LINEAR, vol);
 }
 
 float MediaPlayer::audioVolume() const
 {
     float vol = 0.f;
-    if (pipeline_ && media_.hasaudio)
-        g_object_get(G_OBJECT(pipeline_), "volume", &vol, NULL);
+    if (pipeline_ && media_.hasaudio){
+        GstElement *asink = NULL;
+        g_object_get (G_OBJECT (pipeline_), "audio-sink", &asink, NULL);
+        if ( asink )
+            g_object_get(G_OBJECT(asink), "volume", &vol, NULL);
+        else
+            g_object_get(G_OBJECT(pipeline_), "volume", &vol, NULL);
+    }
     return vol;
 }
 

src/NetworkSource.cpp

@@ -27,6 +27,9 @@
 #include <gst/pbutils/pbutils.h>
 #include <gst/gst.h>
 
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "SystemToolkit.h"

src/ShaderEditWindow.cpp

@@ -363,6 +363,7 @@ void ShaderEditWindow::Render()
             }
             // cancel edit clone
             else {
+                // possibility that source was removed
                 // disable editor
                 _editor.SetReadOnly(true);
                 _editor.SetColorizerEnable(false);

src/Streamer.cpp

@@ -33,6 +33,9 @@
 #include <gst/pbutils/pbutils.h>
 
 //osc
+#if ((ULONG_MAX) != (UINT_MAX))
+#define _M_X64
+#endif
 #include "osc/OscOutboundPacketStream.h"
 
 #include "Settings.h"