"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Global.h" between
ssr-0.4.1.tar.gz and ssr-0.4.2.tar.gz

About: SimpleScreenRecorder is a screen (video-audio) recorder for Linux.

Global.h  (ssr-0.4.1):Global.h  (ssr-0.4.2)
skipping to change at line 32 skipping to change at line 32
#include <QtGui> #include <QtGui>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QProcess> #include <QProcess>
#include <QTimer> #include <QTimer>
#include <QAction> #include <QAction>
#include <QApplication> #include <QApplication>
#include <QDesktopServices>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QFileDialog> #include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
#include <QMainWindow> #include <QMainWindow>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QProgressDialog> #include <QProgressDialog>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
skipping to change at line 109 skipping to change at line 110
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
// replacement for Qt::WindowTransparentForInput. // replacement for Qt::WindowTransparentForInput.
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#endif #endif
// replacement for QX11Info::isPlatformX11() // replacement for QX11Info::isPlatformX11()
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
inline bool IsPlatformX11() {
char *v = getenv("XDG_SESSION_TYPE");
return (v == NULL || strcasecmp(v, "x11") == 0);
}
#else
inline bool IsPlatformX11() { inline bool IsPlatformX11() {
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
if(!QX11Info::isPlatformX11())
return false;
#endif
char *v = getenv("XDG_SESSION_TYPE"); char *v = getenv("XDG_SESSION_TYPE");
return ((v == NULL || strcasecmp(v, "x11") == 0) && QX11Info::isPlatformX if(v != NULL) {
11()); if(strcasecmp(v, "x11") == 0)
return true;
if(strcasecmp(v, "wayland") == 0 || strcasecmp(v, "mir") == 0)
return false;
}
char *d = getenv("DISPLAY");
return (d != NULL);
} }
#endif
// undefine problematic Xlib macros // undefine problematic Xlib macros
#undef Bool #undef Bool
extern "C" { extern "C" {
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/avutil.h> #include <libavutil/avutil.h>
#include <libavutil/channel_layout.h> #include <libavutil/channel_layout.h>
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
 End of changes. 5 change blocks. 
9 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)