erge branch 'master' into devel
This commit is contained in:
6 files changed
+11
-9
No files matched your search
+1
-1
@@ -2,5 +2,5 @@ language: cpp
|
||||
dist: xenial
|
||||
before_install:
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libopencv-dev
|
||||
- sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev
|
||||
script: mkdir -p build && cd build && cmake .. && make && cd ..
|
||||
@@ -10,6 +10,7 @@ cmake_minimum_required( VERSION 3.2.0 )
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
|
||||
INCLUDE( cmake/ModulesFct.cmake )
|
||||
INCLUDE(FeatureSummary)
|
||||
INCLUDE(GNUInstallDirs)
|
||||
|
||||
######################################################################################
|
||||
# Project Definition
|
||||
|
||||
@@ -30,8 +30,10 @@ PlaYUVerAppAdaptor::PlaYUVerAppAdaptor( PlaYUVerApp* app )
|
||||
: QDBusAbstractAdaptor( app ), m_app( app )
|
||||
{
|
||||
// application dbus interface
|
||||
QDBusConnection::sessionBus().registerObject( QStringLiteral( PLAYUVER_DBUS_PATH ), this,
|
||||
Bool isRegistered = QDBusConnection::sessionBus().registerObject( QStringLiteral( PLAYUVER_DBUS_PATH ), this,
|
||||
QDBusConnection::ExportAllSlots );
|
||||
|
||||
Q_ASSERT( isRegistered == true );
|
||||
}
|
||||
|
||||
PlaYUVerAppAdaptor::~PlaYUVerAppAdaptor()
|
||||
|
||||
@@ -33,14 +33,14 @@
|
||||
#include <QtDBus>
|
||||
|
||||
#define PLAYUVER_DBUS_SESSION_NAME "org.pixlra.PlaYUVer.application"
|
||||
#define PLAYUVER_DBUS_PATH "/MainApplication"
|
||||
#define PLAYUVER_DBUS_PATH "/"
|
||||
|
||||
class PlaYUVerApp;
|
||||
|
||||
class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_CLASSINFO( "D-Bus Interface", "org.pixlra.PlaYUVer.application" )
|
||||
Q_CLASSINFO( "D-Bus Interface", PLAYUVER_DBUS_SESSION_NAME )
|
||||
Q_PROPERTY( QString activeSession READ activeSession )
|
||||
public:
|
||||
PlaYUVerAppAdaptor( PlaYUVerApp* app );
|
||||
|
||||
+1
-2
@@ -56,8 +56,7 @@ int main( int argc, char* argv[] )
|
||||
* use dbus, if available
|
||||
* allows for resuse of running Kate instances
|
||||
*/
|
||||
QDBusConnectionInterface* const sessionBusInterface = QDBusConnection::sessionBus().interface();
|
||||
if( sessionBusInterface )
|
||||
if (QDBusConnectionInterface * const sessionBusInterface = QDBusConnection::sessionBus().interface())
|
||||
{
|
||||
Bool force_new = false;
|
||||
QStringList filenameList;
|
||||
|
||||
@@ -233,10 +233,10 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef FF_USER_CODEC_PARAM
|
||||
m_cFrame = av_frame_alloc();
|
||||
#if( ( LIBAVCODEC_VERSION_MAJOR >= 56 ) && ( LIBAVCODEC_VERSION_MINOR >= 0 ) )
|
||||
m_cFrame = av_frame_alloc();
|
||||
#else
|
||||
m_cFrame = avcodec_alloc_frame();
|
||||
m_cFrame = avcodec_alloc_frame();
|
||||
#endif
|
||||
if( !m_cFrame )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user