diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eddbcd..dde514e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,8 +383,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") SET(CPACK_PACKAGE_CONTACT "bruno.herbelin@gmail.com") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt") SET(CPACK_PACKAGE_VERSION_MAJOR "0") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -#SET(CPACK_PACKAGE_VERSION_PATCH "${GLMIXER_WC_REVISION}") +SET(CPACK_PACKAGE_VERSION_MINOR "2") SET(CPACK_PACKAGE_VENDOR "Bruno Herbelin") SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/" diff --git a/MediaPlayer.cpp b/MediaPlayer.cpp index 92c1fff..cac81a2 100644 --- a/MediaPlayer.cpp +++ b/MediaPlayer.cpp @@ -161,8 +161,6 @@ void MediaPlayer::execute_open() // setup appsink GstElement *sink = gst_bin_get_by_name (GST_BIN (pipeline_), "sink"); - GstBaseSink *s = GST_BASE_SINK(sink); - s->eos; if (sink) { // instruct the sink to send samples synched in time diff --git a/RenderingManager.cpp b/RenderingManager.cpp index 987bde1..6fcbe3e 100644 --- a/RenderingManager.cpp +++ b/RenderingManager.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -616,7 +616,7 @@ bool RenderingWindow::init(int id, GLFWwindow *share) // if not main window if ( master_ != NULL ) { - // Disable vsync + // Enable vsync on output window glfwSwapInterval(Settings::application.render.vsync); // no need for multisampling glDisable(GL_MULTISAMPLE); @@ -626,9 +626,9 @@ bool RenderingWindow::init(int id, GLFWwindow *share) glfwMakeContextCurrent(master_); } else { - // Enable vsync on main window + // Disable vsync on main window glfwSwapInterval(0); - // enable Antialiasing multisampling + // Enable Antialiasing multisampling if (Settings::application.render.multisampling > 0) { glEnable(GL_MULTISAMPLE); glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);