eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

validate v0.2 on OSX.

Browse Source
This commit is contained in:
brunoherbelin
2020-07-31 00:12:19 +02:00
parent cc42e5581a
commit fcb4819341
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -383,8 +383,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
SET(CPACK_PACKAGE_CONTACT "bruno.herbelin@gmail.com") SET(CPACK_PACKAGE_CONTACT "bruno.herbelin@gmail.com")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
SET(CPACK_PACKAGE_VERSION_MAJOR "0") SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "2")
#SET(CPACK_PACKAGE_VERSION_PATCH "${GLMIXER_WC_REVISION}")
SET(CPACK_PACKAGE_VENDOR "Bruno Herbelin") SET(CPACK_PACKAGE_VENDOR "Bruno Herbelin")
SET(CPACK_SOURCE_IGNORE_FILES SET(CPACK_SOURCE_IGNORE_FILES
"/\\\\.git/" "/\\\\.git/"

2
MediaPlayer.cpp
View File

@@ -161,8 +161,6 @@ void MediaPlayer::execute_open()
// setup appsink // setup appsink
GstElement *sink = gst_bin_get_by_name (GST_BIN (pipeline_), "sink"); GstElement *sink = gst_bin_get_by_name (GST_BIN (pipeline_), "sink");
GstBaseSink *s = GST_BASE_SINK(sink);
s->eos;
if (sink) { if (sink) {
// instruct the sink to send samples synched in time // instruct the sink to send samples synched in time

8
RenderingManager.cpp
View File

@@ -1,4 +1,4 @@
#include <cstring> #include <cstring>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <chrono> #include <chrono>
@@ -616,7 +616,7 @@ bool RenderingWindow::init(int id, GLFWwindow *share)
// if not main window // if not main window
if ( master_ != NULL ) { if ( master_ != NULL ) {
// Disable vsync // Enable vsync on output window
glfwSwapInterval(Settings::application.render.vsync); glfwSwapInterval(Settings::application.render.vsync);
// no need for multisampling // no need for multisampling
glDisable(GL_MULTISAMPLE); glDisable(GL_MULTISAMPLE);
@@ -626,9 +626,9 @@ bool RenderingWindow::init(int id, GLFWwindow *share)
glfwMakeContextCurrent(master_); glfwMakeContextCurrent(master_);
} }
else { else {
// Enable vsync on main window // Disable vsync on main window
glfwSwapInterval(0); glfwSwapInterval(0);
// enable Antialiasing multisampling // Enable Antialiasing multisampling
if (Settings::application.render.multisampling > 0) { if (Settings::application.render.multisampling > 0) {
glEnable(GL_MULTISAMPLE); glEnable(GL_MULTISAMPLE);
glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST); glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);