Projects
Multimedia
qx11grab
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 6
View file
qx11grab.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 19 15:15:15 UTC 2020 - olaf@aepfle.de + +- Update to version 0.4.12 + +------------------------------------------------------------------- Fri Nov 08 2013 - joerg.lorenzen@ki.tng.de - Update to 0.4.10
View file
qx11grab.spec
Changed
@@ -17,37 +17,35 @@ # Name: qx11grab -Version: 0.4.10 +Version: 0.4.12 Release: 0 License: GPL-3.0 Summary: Qt4 applet for recording x11 windows with ffmpeg Url: http://qx11grab.hjcms.de Group: Productivity/Multimedia/Other -Source: http://qx11grab.hjcms.de/downloads/%{version}/%{name}-%{version}.tar.bz2 -## patch to skip pulse version check for open SUSE > 12.3, -## configure fails because version can't be parsed (4.0-270-g9490a) -Patch0: qx11grab-skip_pulse_version_check.patch -BuildRequires: cmake >= 2.8.0 -BuildRequires: libkde4-devel -BuildRequires: update-desktop-files +Source: http://qx11grab.hjcms.de/downloads/%{version}/%{name}-%{version}.tar.xz +Patch0: qx11grab.patch +BuildRequires: ImageMagick +BuildRequires: cmake +BuildRequires: pkgconfig(QJson) BuildRequires: pkgconfig(QtCore) >= 4.7.2 BuildRequires: pkgconfig(QtGui) >= 4.7.2 BuildRequires: pkgconfig(alsa) >= 1.0.14 BuildRequires: pkgconfig(dbus-1) >= 1.4.12 -BuildRequires: pkgconfig(libavcodec) = 56.60.100 -BuildRequires: pkgconfig(libavfilter) = 5.40.101 -BuildRequires: pkgconfig(libavformat) = 56.40.101 -BuildRequires: pkgconfig(libavutil) = 54.31.100 -BuildRequires: pkgconfig(libpulse) => 0.9 +BuildRequires: pkgconfig(fontconfig) >= 2.4.0 +BuildRequires: pkgconfig(freetype2) >= 2.4.0 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavfilter) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libv4l2) -BuildRequires: libnotify-tools -BuildRequires: fdupes -# for building extra icons -BuildRequires: inkscape +BuildRequires: pkgconfig(x11) >= 1.3.4 +BuildRequires: pkgconfig(xrandr) >= 1.3 +BuildRequires: update-desktop-files +Requires: libnotify-tools Requires: ffmpeg -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description qx11grab is a systray program that uses FFmpeg for recording X11 desktop @@ -57,60 +55,35 @@ all commands for FFmpeg. %prep -%setup -q -%if 0%{?suse_version} > 1230 -%patch0 -%endif +%autosetup -p1 %build -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" -mkdir build && cd build -cmake .. \ - %ifarch x86_64 - -DLIB_SUFFIX:STRING=64 \ - %endif +%cmake \ -DFFMPEG_SHAREDIR=%{_datadir}/ffmpeg \ -DFFMPEG_BINARY=%{_bindir}/ffmpeg \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_LIBDIR=%{_libdir} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DNOTIFYSEND_BINARY=%{_bindir}/notify-send \ + -DINKSCAPE_BINARY=$(type -P false) \ -DINSTALL_EXTRA_FFPRESETS=ON \ - -DENABLE_KDE_SUPPORT=ON \ + -DENABLE_KDE_SUPPORT=OFF \ -DENABLE_WEBCAM_FILTER=TRUE -make %{?_smp_mflags} +%cmake_build %install -cd build -%make_install +%cmake_install %suse_update_desktop_file -r qx11grab Qt KDE Utility Applet -%fdupes %{buildroot} - -%clean -%{?buildroot:rm -rf %{buildroot}} - %files -%defattr(-,root,root) %{_bindir}/qx11grab %{_datadir}/dbus-1/interfaces/de.hjcms.qx11grab.xml %{_datadir}/dbus-1/services/de.hjcms.qx11grab.service %{_datadir}/applications/qx11grab.desktop -%{_datadir}/pixmaps/qx11grab.png -%dir %{_datadir}/pixmaps/qx11grab -%{_datadir}/pixmaps/qx11grab/position_*.png -%{_datadir}/icons/hicolor/*/apps/qx11grab.png -%{_datadir}/icons/hicolor/scalable/apps/qx11grab.svgz +%{_datadir}/pixmaps/* +%{_datadir}/icons/* %{_datadir}/qt4/translations/qx11grab_*.qm %{_mandir}/man1/qx11grab.1.gz %{_mandir}/de/man1/qx11grab.1.gz -%dir %{_datadir}/ffmpeg -%{_datadir}/ffmpeg/libx264-QX11Grab.ffpreset +%{_datadir}/ffmpeg %{_datadir}/qx11grab/ -%dir %{_libdir}/qx11grab -%{_libdir}/qx11grab/libUnsharp.so -%{_libdir}/qx11grab/libdrawtext.so -%{_libdir}/qx11grab/libfade.so -%{_libdir}/qx11grab/libsetdar.so -%{_libdir}/qx11grab/libwatermark.so +%{_libdir}/qx11grab %changelog
View file
qx11grab-skip_pulse_version_check.patch
Deleted
@@ -1,14 +0,0 @@ ---- modules/FindPulse.cmake.orig 2013-11-09 01:05:48.794677037 +0100 -+++ modules/FindPulse.cmake 2013-11-09 01:05:48.831676303 +0100 -@@ -45,9 +45,9 @@ - # Optional - pulseaudio library target - #============================================================================= - IF (PULSE_FOUND) -- INCLUDE (MacroEnsureVersion) -+## INCLUDE (MacroEnsureVersion) - ## from pulse version 1.1 to 2.0 the pulsecommon library was moved in a sub directory -- MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API) -+## MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API) - - IF (NOT PULSE_OLD_API) - MESSAGE (STATUS " search pulseaudio linker target for pulse>=${PULSE_VERSION}")
View file
qx11grab.patch
Added
@@ -0,0 +1,63 @@ +--- a/modules/CheckingGNUCXX.cmake ++++ b/modules/CheckingGNUCXX.cmake +@@ -17,9 +17,9 @@ MACRO_ENSURE_VERSION ("4.6.0" "${_gcc_ve + MACRO_ENSURE_VERSION ("4.7.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_7) + + IF (CMAKE_SYSTEM_NAME MATCHES Linux) +- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith") +- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fexceptions") +- ADD_DEFINITIONS (-D_BSD_SOURCE -DQT_NO_EXCEPTIONS) ++# SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith") ++# SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fexceptions") ++ ADD_DEFINITIONS ( -DQT_NO_EXCEPTIONS) + ENDIF (CMAKE_SYSTEM_NAME MATCHES Linux) + + # gcc under Windows +--- a/modules/FindPulse.cmake ++++ b/modules/FindPulse.cmake +@@ -45,9 +45,6 @@ PKG_CHECK_MODULES (PULSE libpulse${PULSE + # Optional - pulseaudio library target + #============================================================================= + IF (PULSE_FOUND) +- INCLUDE (MacroEnsureVersion) +- ## from pulse version 1.1 to 2.0 the pulsecommon library was moved in a sub directory +- MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API) + + IF (NOT PULSE_OLD_API) + MESSAGE (STATUS " search pulseaudio linker target for pulse>=${PULSE_VERSION}") +--- a/src/avoptions/avoptions.cpp ++++ b/src/avoptions/avoptions.cpp +@@ -178,9 +178,9 @@ namespace QX11Grab + { + QList<FFOption> list; + avcodec_register_all(); +- for ( int i = 0; i < PIX_FMT_NB; i++ ) ++ for ( int i = 0; i < AV_PIX_FMT_NB; i++ ) + { +- const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ]; ++ const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_get( static_cast<AVPixelFormat> ( i ) ); + if ( ! pix_desc->name ) + continue; + +--- a/src/messanger/messanger.cpp ++++ b/src/messanger/messanger.cpp +@@ -120,7 +120,7 @@ bool Messanger::notify_send ( const QStr + args << QString::fromUtf8 ( "\"%1\"" ).arg ( title ); + args << QString::fromUtf8 ( "\"%1\"" ).arg ( body ); + QProcess process ( this ); +- return process.startDetached ( "notify-send", args ); ++ return process.startDetached ( NOTIFYSEND_BINARY, args ); + #endif + + return false; +--- a/svg/CMakeLists.txt ++++ b/svg/CMakeLists.txt +@@ -20,7 +20,7 @@ SET (_position_templates + + FILE (MAKE_DIRECTORY ${ARCHIVE_OUTPUT_PATH}) + FOREACH(tpl ${_position_templates}) +- EXECUTE_PROCESS (COMMAND ${INKSCAPE_BINARY} --export-png=${ARCHIVE_OUTPUT_PATH}/${tpl}.png --without-gui --vacuum-defs --export-dpi=72 --export-width=48 --export-height=48 --export-background=ffffffff ${CMAKE_CURRENT_SOURCE_DIR}/${tpl}.svg) ++ EXECUTE_PROCESS (COMMAND convert -density 1200 -resize 48x48 ${CMAKE_CURRENT_SOURCE_DIR}/${tpl}.svg ${ARCHIVE_OUTPUT_PATH}/${tpl}.png) + INSTALL (FILES + ${ARCHIVE_OUTPUT_PATH}/${tpl}.png + DESTINATION share/pixmaps/qx11grab/
View file
qx11grab-0.4.10.tar.bz2/.gitmodules -> qx11grab-0.4.12.tar.xz/.gitmodules
Changed
@@ -1,3 +1,3 @@ [submodule "ffmpeg"] path = utils/ffmpeg - url = ffmpeg:ffmpeg + url = git://source.ffmpeg.org/ffmpeg.git
View file
qx11grab-0.4.10.tar.bz2/CMakeLists.txt -> qx11grab-0.4.12.tar.xz/CMakeLists.txt
Changed
@@ -5,9 +5,18 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8.0 FATAL_ERROR) ENABLE_LANGUAGE (CXX) -IF (CMAKE_VERSION STREQUAL 2.8.4) - CMAKE_POLICY (SET CMP0017 OLD) -ENDIF (CMAKE_VERSION STREQUAL 2.8.4) +IF (POLICY CMP0017) + CMAKE_POLICY (SET CMP0017 NEW) +ENDIF (POLICY CMP0017) + +IF (POLICY CMP0022) + CMAKE_POLICY (SET CMP0022 OLD) +ENDIF (POLICY CMP0022) + +IF (POLICY CMP0026) + CMAKE_POLICY (SET CMP0026 OLD) +ENDIF (POLICY CMP0026) + SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules") ############################################################## @@ -16,6 +25,7 @@ SET (QT_MIN_VERSION 4.7.2) FIND_PACKAGE (Qt4 REQUIRED) FIND_PACKAGE (Qt4 COMPONENTS QTDBUS QTXML QTNETWORK) +FIND_PACKAGE (QJSON REQUIRED) FIND_PACKAGE (PkgConfig REQUIRED) FIND_PACKAGE (ALSA REQUIRED) FIND_PACKAGE (FFmpeg REQUIRED) @@ -38,7 +48,7 @@ SET (QX11GRAB_VERSION_MAJOR 0) SET (QX11GRAB_VERSION_MINOR 4) -SET (QX11GRAB_VERSION_RELEASE 10) +SET (QX11GRAB_VERSION_RELEASE 12) SET (QX11GRAB_VERSION_DEVELOPMENT "") SET (QX11GRAB_VERSION "${QX11GRAB_VERSION_MAJOR}.${QX11GRAB_VERSION_MINOR}.${QX11GRAB_VERSION_RELEASE}${QX11GRAB_VERSION_DEVELOPMENT}") SET (QX11GRAB_DBUS_DOMAIN_NAME "de.hjcms.qx11grab") @@ -65,6 +75,13 @@ INCLUDE (MacroEnsureVersion) ############################################################## +## Twitch JSON Script URL +## https://github.com/justintv/twitch-api +############################################################## + +SET (TWITCH_JSON_SERVERS "https://api.twitch.tv/kraken/ingests") + +############################################################## ## Compile Optimisation ############################################################## INCLUDE (CheckingGNUCXX)
View file
qx11grab-0.4.10.tar.bz2/ChangeLog -> qx11grab-0.4.12.tar.xz/ChangeLog
Changed
@@ -1,3 +1,12 @@ +Version 0.4.12 + - BUGFIX Crash with empty expert settings + - !!! NOTICE !!! + * HJCMS FTP Access is obsolete and removed at June 2015 + * HJCMS Repository has moved to https://github.com/HJCMS/ + +Version 0.4.11 + - Move Obsolete Volume Slider value -vol to new -filter:a volume=%ddB + Version 0.4.10 - Update Rubberband - Changes for FFmpeg 2.0
View file
qx11grab-0.4.10.tar.bz2/README -> qx11grab-0.4.12.tar.xz/README
Changed
@@ -1,9 +1,10 @@ -This is QX11Grab +This is QX11Grab Project +Open Source X11 Windows Recording Software for GNU/Linux Systems -- INSTALLING SEE INSTALL -If you have a source package (a .tar.gz,.tar.bz2,.tar.xz or .tar.lzma file), -follow the instructions in the INSTALL file. + If you have a source package (a .tar.gz,.tar.bz2,.tar.xz or .tar.lzma file), + follow the instructions in the INSTALL file. -- SUPPORTED PLATFORMS @@ -11,16 +12,16 @@ -- HOW TO REPORT A BUG -If you think you have found a bug in qx11Grab, we would like to hear about it so that we can fix it. -Report Bugs to : https://launchpad.net/~juergen-heinemann/+archive/qx11grab.hjcms.de + If you think you have found a bug in qx11Grab, we would like to hear about it so that we can fix it. + Report Bugs to : https://github.com/HJCMS/qx11grab/issues -Always include the following information in your bug report: the name -and version number of your compiler; the name and version number of -your operating system; the version of qx11Grab you are using, and what -configure options it was compiled with. + Always include the following information in your bug report: the name + and version number of your compiler; the name and version number of + your operating system; the version of qx11Grab you are using, and what + configure options it was compiled with. -If the problem you are reporting is only visible at run-time, try to -create a small test program that shows the problem when run. Often, -such a program can be created with some minor changes to one of the many -example programs in qx11Grab's examples directory, or to the autotests that -are available in the public source repository on http://gitweb.hjcms.de/. + If the problem you are reporting is only visible at run-time, try to + create a small test program that shows the problem when run. Often, + such a program can be created with some minor changes to one of the many + example programs in qx11Grab's examples directory, or to the autotests that + are available in the public source repository on https://github.com/HJCMS/.
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ar.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_ar.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_cs.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_cs.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+60"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> <source>Audio System</source> <translation>Zvukový systém</translation> </message> @@ -127,21 +127,7 @@ <translation>Zesilovač zvuku:</translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation>Nastavit sílu hlasitosti zvuku (256=obvyklá)</translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation>Nastavit zesílení zvuku. -Výchozí: 256=obvyklé</translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation>Zařízení pro zachytávání zvuku:</translation> </message> @@ -207,19 +193,31 @@ <translation>dvojitý, rovinný</translation> </message> <message> - <location line="+232"/> + <location line="+242"/> <location line="+16"/> <source>Unknown</source> <translation>Neznámý</translation> </message> <message> - <location line="-318"/> + <location line="-331"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation>Výběr rozhraní pro zvuk</translation> </message> <message> - <location line="+37"/> + <location line="+19"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Audio Capture Device Example for OSS: /dev/dsp</source> <extracomment>WhatsThis</extracomment> @@ -309,7 +307,7 @@ <translation>Karaoke</translation> </message> <message> - <location line="-111"/> + <location line="-114"/> <source>Audio Device</source> <translation>Zvukové zařízení</translation> </message> @@ -467,7 +465,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation>Nastavit[*]</translation> @@ -502,6 +500,11 @@ <source>Rubberband</source> <translation>Gumička</translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1830,7 +1833,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation>Vzorkovací formát</translation> @@ -2240,6 +2243,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_da.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_da.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_de.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_de.ts
Changed
@@ -102,9 +102,9 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+60"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> <source>Audio System</source> - <translation></translation> + <translation>Audio System</translation> </message> <message> <location line="+1"/> @@ -127,24 +127,7 @@ <translation>Audio Verstärker:</translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation variants="yes"> - <lengthvariant>Setze die Audio Lautstärke (256=Normal)</lengthvariant> - <lengthvariant>Lautstärke</lengthvariant> - </translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation>Setze die Audio Verstärkung. -Standard: 256=Normal</translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation>Audio Schnittstelle:</translation> </message> @@ -210,19 +193,31 @@ <translation>64-Bit-Gleitkommazahl, flach</translation> </message> <message> - <location line="+232"/> + <location line="+242"/> <location line="+16"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> <message> - <location line="-318"/> + <location line="-331"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation>Auswahl der Audio Schnittstelle</translation> </message> <message> - <location line="+37"/> + <location line="+19"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation>Lautstärke Pegel einstellen +/- 15dB</translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation>Setze den Intialwert in dB für die Lautstärke Verstärkung, dieser Wert wird als Kanalfilter verarbeitet.</translation> + </message> + <message> + <location line="+19"/> <source>Audio Capture Device Example for OSS: /dev/dsp</source> <extracomment>WhatsThis</extracomment> @@ -312,7 +307,7 @@ <translation></translation> </message> <message> - <location line="-111"/> + <location line="-114"/> <source>Audio Device</source> <translation>Audio Schnittstelle</translation> </message> @@ -470,7 +465,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation>Konfigurieren[*]</translation> @@ -505,6 +500,11 @@ <source>Rubberband</source> <translation>Gummiband</translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1833,7 +1833,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation>Abfrageformat</translation> @@ -2252,6 +2252,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation>Streaming Schlüssel:</translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation>Immer Mikrifonkanäle mit System verschmelzen</translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation>Nur verfügbar mit PulseAudio</translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_es.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_es.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_fr.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_fr.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ja_JP.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_ja_JP.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_lt.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_lt.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation>pasirinkite naudotiną garso sąsają</translation> @@ -133,21 +133,7 @@ <translation>Garso stiprumas:</translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation>Keisti garsumą (256=normalus)</translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation>Keisti garsumą. -Numatytasis: 256</translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation>Garso įrašymo įrenginys:</translation> </message> @@ -171,12 +157,24 @@ Pvz., OSS atveju – /dev/dsp</translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation>Garso įrenginys</translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation>Atveria dialogo langą, kuriame galite pasirinkti garso įrašymo įrenginį</translation> </message> @@ -308,7 +306,7 @@ <translation>Karaokė</translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation>Nežinomas</translation> @@ -467,7 +465,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation>Konfigūracija[*]</translation> @@ -502,6 +500,11 @@ <source>Rubberband</source> <translation>Rėmelis</translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1828,7 +1831,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2238,6 +2241,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_pl.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_pl.ts
Changed
@@ -103,7 +103,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+49"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+48"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> @@ -140,19 +140,18 @@ </message> <message> <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> + <source>Change Audio Volume +/- 15 dB</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+12"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -307,7 +306,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -466,7 +465,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -501,6 +500,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1827,7 +1831,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2237,6 +2241,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_pt.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_pt.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ru.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_ru.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sk.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_sk.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sl.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_sl.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sr_RS.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_sr_RS.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+60"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> <source>Audio System</source> <translation type="unfinished"></translation> </message> @@ -127,20 +127,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -156,7 +143,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-67"/> + <location line="-70"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> @@ -167,7 +154,19 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+37"/> + <location line="+19"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Audio Capture Device Example for OSS: /dev/dsp</source> <extracomment>WhatsThis</extracomment> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation>Непознато</translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation>Подешавање[*]</translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sv.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_sv.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_uk.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_uk.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_untranslated.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_untranslated.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_zh_CN.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_zh_CN.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/i18n/qx11grab_zh_TW.ts -> qx11grab-0.4.12.tar.xz/i18n/qx11grab_zh_TW.ts
Changed
@@ -102,7 +102,7 @@ <context> <name>AudioDeviceWidget</name> <message> - <location filename="../src/audio/audiodevicewidget.cpp" line="+59"/> + <location filename="../src/audio/audiodevicewidget.cpp" line="+58"/> <source>choose the audio interface to use</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -133,20 +133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Change Audio Volume (256=normal)</source> - <extracomment>ToolTip</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Change Audio Amplifier. -Default: 256=normal</source> - <extracomment>WhatsThis</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> + <location line="+21"/> <source>Audio Capture Device:</source> <translation type="unfinished"></translation> </message> @@ -169,12 +156,24 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-47"/> + <location line="-50"/> <source>Audio Device</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+29"/> + <source>Change Audio Volume +/- 15 dB</source> + <extracomment>ToolTip</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set an initial volume, in dB, to be assumed for each channel when filtering starts.</source> + <extracomment>WhatsThis</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> <source>Open dialog to select audio capture device</source> <translation type="unfinished"></translation> </message> @@ -306,7 +305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+211"/> <location line="+16"/> <source>Unknown</source> <translation type="unfinished"></translation> @@ -465,7 +464,7 @@ <context> <name>ConfigDialog</name> <message> - <location filename="../src/settings/configdialog.cpp" line="+46"/> + <location filename="../src/settings/configdialog.cpp" line="+47"/> <source>Configure[*]</source> <extracomment>WindowTitle NOTE Do not strip "[*]" This is needed for Modifications View an will Automatical hidden</extracomment> <translation type="unfinished"></translation> @@ -500,6 +499,11 @@ <source>Rubberband</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+4"/> + <source>Twitch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigExtensions</name> @@ -1826,7 +1830,7 @@ <context> <name>QX11Grab::AVOptions</name> <message> - <location filename="../src/avoptions/avoptions.cpp" line="+166"/> + <location filename="../src/avoptions/avoptions.cpp" line="+167"/> <source>sample format</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -2236,6 +2240,35 @@ </message> </context> <context> + <name>Twitch</name> + <message> + <location filename="../src/settings/twitch.cpp" line="+46"/> + <source>twitch.tv</source> + <extracomment>GroupBoxTitle</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Streaming Key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Server:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Always join micro output with system audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Only available with pulseaudio</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Unsharp</name> <message> <location filename="../src/filters/unsharp/unsharp.cpp" line="+39"/>
View file
qx11grab-0.4.10.tar.bz2/modules/CheckingGNUCXX.cmake -> qx11grab-0.4.12.tar.xz/modules/CheckingGNUCXX.cmake
Changed
@@ -1,4 +1,6 @@ ## Check_GNU_CXX.cmake +include (MacroEnsureVersion) +include (TestCXXAcceptsFlag) # get the gcc version EXECUTE_PROCESS (COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE _gcc_version_info) @@ -10,16 +12,13 @@ ENDIF (NOT _gcc_version) MESSAGE (STATUS "Found GCC Version \"${_gcc_version}\" start performing tests...") -MACRO_ENSURE_VERSION ("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) -MACRO_ENSURE_VERSION ("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) MACRO_ENSURE_VERSION ("4.5.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_5) MACRO_ENSURE_VERSION ("4.6.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_6) MACRO_ENSURE_VERSION ("4.7.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_7) -MACRO_ENSURE_VERSION ("4.8.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_8) IF (CMAKE_SYSTEM_NAME MATCHES Linux) SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fno-exceptions") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fexceptions") ADD_DEFINITIONS (-D_BSD_SOURCE -DQT_NO_EXCEPTIONS) ENDIF (CMAKE_SYSTEM_NAME MATCHES Linux) @@ -27,41 +26,33 @@ IF (MINGW) SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols -Wl,--disable-auto-import") SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols -Wl,--disable-auto-import") - ADD_DEFINITIONS(-DQT_NO_DEBUG) ENDIF (MINGW) # VISIBILITY SUPPORT http://gcc.gnu.org/wiki/Visibility -IF (GCC_IS_NEWER_THAN_4_1) - CHECK_CXX_COMPILER_FLAG (-fvisibility=hidden __CHECK_GCC_VISIBILITY) - SET (__CHECK_GCC_VISIBILITY ${__CHECK_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") - IF (__CHECK_GCC_VISIBILITY) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") - IF (GCC_IS_NEWER_THAN_4_2) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_VISIBILITY -fvisibility-inlines-hidden") - ## Bugfix gcc-4.3 need explicit definition - ADD_DEFINITIONS (-DHAVE_VISIBILITY) - ENDIF (GCC_IS_NEWER_THAN_4_2) - ENDIF (__CHECK_GCC_VISIBILITY) -ENDIF (GCC_IS_NEWER_THAN_4_1) +CHECK_CXX_ACCEPTS_FLAG (-fvisibility=hidden __CHECK_GCC_VISIBILITY) +SET (__CHECK_GCC_VISIBILITY ${__CHECK_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") +IF (__CHECK_GCC_VISIBILITY) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + IF (GCC_IS_NEWER_THAN_4_2) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_VISIBILITY -fvisibility-inlines-hidden") + # Bugfix gcc-4.3 need explicit definition + ADD_DEFINITIONS (-DHAVE_VISIBILITY) + ENDIF (GCC_IS_NEWER_THAN_4_2) +ENDIF (__CHECK_GCC_VISIBILITY) # STACK-PROTECTOR SUPPORT -IF (GCC_IS_NEWER_THAN_4_1) - CHECK_CXX_COMPILER_FLAG(-fstack-protector __CHECK_GCC_STACK_PROTECTOR) - SET (__CHECK_GCC_STACK_PROTECTOR ${__CHECK_GCC_STACK_PROTECTOR} CACHE BOOL "GCC support for stack-protector") - IF (__CHECK_GCC_STACK_PROTECTOR) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector -Wstack-protector") - ENDIF (__CHECK_GCC_STACK_PROTECTOR) - # BUFFER CHECKS - CHECK_CXX_COMPILER_FLAG(-D_FORTIFY_SOURCE=2 __CHECK_GCC_FORTIFY_SOURCE) - SET (__CHECK_GCC_FORTIFY_SOURCE ${__CHECK_GCC_FORTIFY_SOURCE} CACHE BOOL "GCC support for -DFORTIFY_SOURCE") - IF(__CHECK_GCC_FORTIFY_SOURCE) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") - ENDIF(__CHECK_GCC_FORTIFY_SOURCE) -ENDIF (GCC_IS_NEWER_THAN_4_1) +CHECK_CXX_ACCEPTS_FLAG (-fstack-protector __CHECK_GCC_STACK_PROTECTOR) +IF (__CHECK_GCC_STACK_PROTECTOR) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector -Wstack-protector") +ENDIF (__CHECK_GCC_STACK_PROTECTOR) +# BUFFER CHECKS +CHECK_CXX_ACCEPTS_FLAG (-D_FORTIFY_SOURCE=2 __CHECK_GCC_FORTIFY_SOURCE) +IF(__CHECK_GCC_FORTIFY_SOURCE) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") +ENDIF(__CHECK_GCC_FORTIFY_SOURCE) # EMIT POSITION-INDEPENDENT CODE -CHECK_CXX_COMPILER_FLAG(-fPIC __CHECK_GCC_FPIC) -SET (__CHECK_GCC_FPIC ${__CHECK_GCC_FPIC} CACHE BOOL "GCC support for -fPIC") +CHECK_CXX_ACCEPTS_FLAG (-fPIC __CHECK_GCC_FPIC) IF (__CHECK_GCC_FPIC) SET (LIB_FPIC_CXXFLAGS "-fPIC") ELSE (__CHECK_GCC_FPIC) @@ -69,8 +60,7 @@ ENDIF (__CHECK_GCC_FPIC) # GIVES SOME ADVANTAGES OVER PIE -CHECK_CXX_COMPILER_FLAG(-pie __CHECK_GCC_FPIE) -SET (__CHECK_GCC_FPIE ${__CHECK_GCC_FPIE} CACHE BOOL "GCC support for -pie") +CHECK_CXX_ACCEPTS_FLAG (-pie __CHECK_GCC_FPIE) IF (__CHECK_GCC_FPIE) SET (APP_PIE_CXXFLAGS "-fPIE") SET (APP_PIE_LDFLAGS "-pie") @@ -79,25 +69,29 @@ SET (APP_PIE_LDFLAGS "") ENDIF (__CHECK_GCC_FPIE) +# Check ISO C++ 2011 Support +CHECK_CXX_ACCEPTS_FLAG (-std=gnu++11 __CHECK_ISO_CPLUSPLUS_2011) +IF (__CHECK_ISO_CPLUSPLUS_2011) + SET (ISOPP2011_CXXFLAGS "-std=gnu++11") +ELSE (__CHECK_ISO_CPLUSPLUS_2011) + SET (ISOPP2011_CXXFLAGS "") +ENDIF (__CHECK_ISO_CPLUSPLUS_2011) + # PASS THE FLAG -EXPORT-DYNAMIC TO THE ELF LINKER, ON TARGETS THAT SUPPORT IT. -CHECK_CXX_COMPILER_FLAG(-rdynamic __CHECK_LINK_RDYNAMIC) -SET (__CHECK_LINK_RDYNAMIC ${__CHECK_LINK_RDYNAMIC} CACHE BOOL "compiler support for -rdynamic") +CHECK_CXX_ACCEPTS_FLAG (-rdynamic __CHECK_LINK_RDYNAMIC) IF (__CHECK_LINK_RDYNAMIC) SET (LIB_RDYNAMIC_CXXFLAGS "-rdynamic") ELSE (__CHECK_LINK_RDYNAMIC) SET (LIB_RDYNAMIC_CXXFLAGS "") ENDIF (__CHECK_LINK_RDYNAMIC) -IF (GCC_IS_NEWER_THAN_4_5) - CHECK_CXX_COMPILER_FLAG(-funwind-tables __CHECK_GCC_UNWIND_TABLES) - SET (__CHECK_GCC_UNWIND_TABLES ${__CHECK_GCC_FPIE} CACHE BOOL "GCC support for -funwind-tables") - IF (__CHECK_GCC_UNWIND_TABLES) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funwind-tables") - IF (GCC_IS_NEWER_THAN_4_6) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fasynchronous-unwind-tables") - ENDIF (GCC_IS_NEWER_THAN_4_6) - ENDIF (__CHECK_GCC_UNWIND_TABLES) -ENDIF (GCC_IS_NEWER_THAN_4_5) +CHECK_CXX_ACCEPTS_FLAG (-funwind-tables __CHECK_GCC_UNWIND_TABLES) +IF (__CHECK_GCC_UNWIND_TABLES) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funwind-tables") + IF (GCC_IS_NEWER_THAN_4_6) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fasynchronous-unwind-tables") + ENDIF (GCC_IS_NEWER_THAN_4_6) +ENDIF (__CHECK_GCC_UNWIND_TABLES) IF (CMAKE_BUILD_TYPE STREQUAL "Debug") MESSAGE (STATUS "Performing CMAKE_CXX_FLAGS_DEBUG") @@ -114,8 +108,3 @@ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-declarations -Wno-old-style-cast") ENDIF (GCC_IS_NEWER_THAN_4_6) ENDIF (CMAKE_BUILD_TYPE STREQUAL "Debug") - -IF (GCC_IS_NEWER_THAN_4_7) - ## FIXME force remove invalid "-std=c++0x" user sets - REMOVE_DEFINITIONS ("-std=c++0x") -ENDIF (GCC_IS_NEWER_THAN_4_7)
View file
qx11grab-0.4.10.tar.bz2/modules/check_ffmpeg_codecid.c -> qx11grab-0.4.12.tar.xz/modules/check_ffmpeg_codecid.c
Changed
@@ -1,7 +1,7 @@ -/** +/* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. -**/ +*/ #include <stdio.h> #include <stdlib.h>
View file
qx11grab-0.4.10.tar.bz2/modules/check_ffmpeg_filter.c -> qx11grab-0.4.12.tar.xz/modules/check_ffmpeg_filter.c
Changed
@@ -1,7 +1,7 @@ -/** +/* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. -**/ +*/ #include <stdio.h> #include <stdlib.h>
View file
qx11grab-0.4.10.tar.bz2/mpackages.pl -> qx11grab-0.4.12.tar.xz/mpackages.pl
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -93,10 +93,10 @@ system ( "tar", "--exclude-vcs", "-cjf", "$destdir/$pkg_version/$pkg_name.tar.bz2", "$pkg_name" ); print "- Generate $pkg_name.tar.gz\n"; system ( "tar", "--exclude-vcs", "-czf", "$destdir/$pkg_version/$pkg_name.tar.gz", "$pkg_name" ); -print "- Generate $pkg_name.tar.lzma\n"; -system ( "tar", "--exclude-vcs", "-cJf", "$destdir/$pkg_version/$pkg_name.tar.lzma", "$pkg_name" ); print "- Generate $pkg_name.tar.xz\n"; system ( "tar", "--exclude-vcs", "-cJf", "$destdir/$pkg_version/$pkg_name.tar.xz", "$pkg_name" ); +print "- Create ZSync $pkg_name.tar.xz.zsync\n"; +system ( "zsyncmake", "-e", "-u", "http://qx11grab.hjcms.de/downloads/$pkg_version/$pkg_name.tar.xz", "-o", "$destdir/$pkg_version/$pkg_name.tar.xz.zsync", "$destdir/$pkg_version/$pkg_name.tar.xz" ); print "- Copy ChangeLog\n"; system ( "cp", "--update", "$repodir/ChangeLog", "$destdir/ChangeLog" ); chdir "$repodir";
View file
qx11grab-0.4.10.tar.bz2/src/aboutdialog.cpp -> qx11grab-0.4.12.tar.xz/src/aboutdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/aboutdialog.h -> qx11grab-0.4.12.tar.xz/src/aboutdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/adaptor.cpp -> qx11grab-0.4.12.tar.xz/src/adaptor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/adaptor.h -> qx11grab-0.4.12.tar.xz/src/adaptor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/application.cpp -> qx11grab-0.4.12.tar.xz/src/application.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/application.h -> qx11grab-0.4.12.tar.xz/src/application.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/abstractaudiodialog.cpp -> qx11grab-0.4.12.tar.xz/src/audio/abstractaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/abstractaudiodialog.h -> qx11grab-0.4.12.tar.xz/src/audio/abstractaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/alsaaudiodialog.cpp -> qx11grab-0.4.12.tar.xz/src/audio/alsaaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/alsaaudiodialog.h -> qx11grab-0.4.12.tar.xz/src/audio/alsaaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/audiodevice.cpp -> qx11grab-0.4.12.tar.xz/src/audio/audiodevice.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/audiodevice.h -> qx11grab-0.4.12.tar.xz/src/audio/audiodevice.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/audiodevicewidget.cpp -> qx11grab-0.4.12.tar.xz/src/audio/audiodevicewidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -39,7 +39,6 @@ /* QtGui */ #include <QtGui/QGridLayout> #include <QtGui/QIcon> -#include <QtGui/QLabel> #include <QtGui/QVBoxLayout> AudioDeviceWidget::AudioDeviceWidget ( QWidget * parent ) @@ -75,14 +74,17 @@ m_slider = new QSlider ( Qt::Horizontal, this ); m_slider->setObjectName ( QLatin1String ( "AudioSlider" ) ); /*: ToolTip */ - m_slider->setToolTip ( trUtf8 ( "Change Audio Volume (256=normal)" ) ); + m_slider->setToolTip ( trUtf8 ( "Change Audio Volume +/- 15 dB" ) ); /*: WhatsThis */ - m_slider->setWhatsThis ( trUtf8 ( "Change Audio Amplifier.\nDefault: 256=normal" ) ); + m_slider->setWhatsThis ( trUtf8 ( "Set an initial volume, in dB, to be assumed for each channel when filtering starts." ) ); m_slider->setSingleStep ( 1 ); - m_slider->setRange ( 256, 512 ); + m_slider->setRange ( -15, +15 ); m_slider->setTickPosition ( QSlider::TicksAbove ); - m_slider->setValue ( 256 ); - gridLayout->addWidget ( m_slider, grow++, 1, 1, 2 ); + m_slider->setValue ( 0 ); + gridLayout->addWidget ( m_slider, grow, 1, 1, 1 ); + m_volume = new QLabel ( this ); + m_volume->setWordWrap ( false ); + gridLayout->addWidget ( m_volume, grow++, 2, 1, 1 ); // } Volume QLabel* txt1 = new QLabel ( this ); @@ -175,6 +177,8 @@ // Updates connect ( m_slider, SIGNAL ( valueChanged ( int ) ), this, SLOT ( integerUpdate ( int ) ) ); + connect ( m_slider, SIGNAL ( valueChanged ( int ) ), + this, SLOT ( audioVolumeChanged ( int ) ) ); connect ( m_audioSampleFormat, SIGNAL ( currentIndexChanged ( int ) ), this, SLOT ( integerUpdate ( int ) ) ); @@ -184,6 +188,23 @@ } /** +* Only Show Device Input Selection +*/ +void AudioDeviceWidget::enableSimpleEdit ( bool b ) +{ + if ( b ) + { + setVolume ( 0 ); + m_slider->setEnabled ( false ); + m_audioSampleFormat->setEnabled ( false ); + m_audioServiceType->setEnabled ( false ); + return; + } + m_slider->setEnabled ( true ); + m_audioSampleFormat->setEnabled ( true ); +} + +/** * Öffnet den Dialog für das setzen der ALSA * PCM Schnittstellen. */ @@ -286,6 +307,7 @@ void AudioDeviceWidget::setVolume ( int i ) { m_slider->setValue ( i ); + audioVolumeChanged ( i ); } /** @@ -296,6 +318,13 @@ return m_slider->value(); } +void AudioDeviceWidget::audioVolumeChanged ( int index ) +{ + QString suffix = ( index>0 ) ? "+" : ""; + QString txt = QString ( "%1%2 dB" ).arg ( suffix,QString::number ( index ) ); + m_volume->setText ( txt ); +} + /** * Setzt das Audio System ueber die Auswahl Box */ @@ -491,8 +520,11 @@ if ( ! getAudioServiceType().isEmpty () ) cmd<< "-audio_service_type" << getAudioServiceType(); - if ( m_slider->value() != 256 ) - cmd << "-vol" << QString::number ( m_slider->value() ); + if ( m_slider->value() != 0 ) + { + QString suffix = ( m_slider->value() >0 ) ? "+" : ""; + cmd << QString::fromUtf8 ( "-filter:a volume=%1%2" ).arg ( suffix, QString::number ( m_slider->value() ) ); + } return cmd; }
View file
qx11grab-0.4.10.tar.bz2/src/audio/audiodevicewidget.h -> qx11grab-0.4.12.tar.xz/src/audio/audiodevicewidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -30,6 +30,7 @@ /* QtGui */ #include <QtGui/QComboBox> #include <QtGui/QGroupBox> +#include <QtGui/QLabel> #include <QtGui/QLineEdit> #include <QtGui/QSlider> #include <QtGui/QSpinBox> @@ -45,6 +46,7 @@ private: QComboBox* m_swapAudio; QSlider* m_slider; + QLabel* m_volume; QLineEdit* device; QToolButton* m_audiodevButton; QComboBox* m_audioSampleFormat; @@ -58,13 +60,14 @@ void statusUpdate ( bool ); void integerUpdate ( int ); void getpcmClicked(); + void audioVolumeChanged ( int index ); void audioEngineChanged ( int index ); Q_SIGNALS: /** * this signal is emitted when items updated */ - void postUpdate( bool ); + void postUpdate ( bool ); public: /** @@ -74,6 +77,11 @@ explicit AudioDeviceWidget ( QWidget * parent = 0 ); /** + * Only Show Device Input Selection + */ + void enableSimpleEdit ( bool ); + + /** * indexes for audio engine ComboBox */ enum AUDIODEV
View file
qx11grab-0.4.10.tar.bz2/src/audio/opensounddialog.cpp -> qx11grab-0.4.12.tar.xz/src/audio/opensounddialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/opensounddialog.h -> qx11grab-0.4.12.tar.xz/src/audio/opensounddialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/pulseaudiodialog.cpp -> qx11grab-0.4.12.tar.xz/src/audio/pulseaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/audio/pulseaudiodialog.h -> qx11grab-0.4.12.tar.xz/src/audio/pulseaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avfilteritem.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/avfilteritem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avfilteritem.h -> qx11grab-0.4.12.tar.xz/src/avoptions/avfilteritem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avfiltermodel.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/avfiltermodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avfiltermodel.h -> qx11grab-0.4.12.tar.xz/src/avoptions/avfiltermodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avoptions.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/avoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -73,12 +73,13 @@ * \li Alle mpeg Formate * \li Alle h\d+ Formate * \li Flash Format + * \li RAW und NUT * TODO Das hier ist im Moment nur eine Notlösung :-/ */ static bool qx11grab_supported_avcodec ( const char* name ) { QString n = QString::fromUtf8 ( name ); - return n.contains ( QRegExp ( "((^lib\\w+)|(dv)|(mpeg)|(h\\d+)|(flv))", Qt::CaseInsensitive ) ); + return n.contains ( QRegExp ( "((^lib\\w+)|(dv)|(mpeg)|(h\\d+)|(flv)|(raw)|(nut))", Qt::CaseInsensitive ) ); } /** generate basic ffmpeg options
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/avoptions.h -> qx11grab-0.4.12.tar.xz/src/avoptions/avoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/codecoptions.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/codecoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/codecoptions.h -> qx11grab-0.4.12.tar.xz/src/avoptions/codecoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/codecselecter.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/codecselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/codecselecter.h -> qx11grab-0.4.12.tar.xz/src/avoptions/codecselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/ffoptionsmenu.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/ffoptionsmenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/ffoptionsmenu.h -> qx11grab-0.4.12.tar.xz/src/avoptions/ffoptionsmenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/formatmenu.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/formatmenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -162,6 +162,11 @@ * dann Automatisch den ersten auswählen */ setEntryEnabled ( p_ActionsList.first()->text() ); } + else if ( name.contains ( "yuv4mpeg", Qt::CaseSensitive ) ) + { + /* Ist es ein MPEG 2 Container ? */ + setEntryEnabled ( QLatin1String ( "y4m" ) ); + } else if ( name.contains ( "mjpeg", Qt::CaseSensitive ) ) { /* Ist es ein mjpeg Container ? */ @@ -179,8 +184,8 @@ } else { - /* in letzter instanz versuche avi */ - setEntryEnabled ( QLatin1String ( "avi" ) ); + /* in letzter instanz versuche nut */ + setEntryEnabled ( QLatin1String ( "nut" ) ); } // Änderungen Nachricht an die ober Klasse
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/formatmenu.h -> qx11grab-0.4.12.tar.xz/src/avoptions/formatmenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/optionsfinder.cpp -> qx11grab-0.4.12.tar.xz/src/avoptions/optionsfinder.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/avoptions/optionsfinder.h -> qx11grab-0.4.12.tar.xz/src/avoptions/optionsfinder.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmark.cpp -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmark.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmark.h -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmark.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkdialog.cpp -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkdialog.h -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkentry.cpp -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkentry.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkentry.h -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkentry.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkselecter.cpp -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkselecter.h -> qx11grab-0.4.12.tar.xz/src/bookmark/bookmarkselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/commandlineedit.cpp -> qx11grab-0.4.12.tar.xz/src/cmd/commandlineedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/commandlineedit.h -> qx11grab-0.4.12.tar.xz/src/cmd/commandlineedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/commandpreview.cpp -> qx11grab-0.4.12.tar.xz/src/cmd/commandpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/commandpreview.h -> qx11grab-0.4.12.tar.xz/src/cmd/commandpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/createcustomitem.cpp -> qx11grab-0.4.12.tar.xz/src/cmd/createcustomitem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/cmd/createcustomitem.h -> qx11grab-0.4.12.tar.xz/src/cmd/createcustomitem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/exportdialog.cpp -> qx11grab-0.4.12.tar.xz/src/exportdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/exportdialog.h -> qx11grab-0.4.12.tar.xz/src/exportdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/ffprocess/ffprocess.cpp -> qx11grab-0.4.12.tar.xz/src/ffprocess/ffprocess.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/ffprocess/ffprocess.h -> qx11grab-0.4.12.tar.xz/src/ffprocess/ffprocess.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/ffprocess/listener.cpp -> qx11grab-0.4.12.tar.xz/src/ffprocess/listener.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/ffprocess/listener.h -> qx11grab-0.4.12.tar.xz/src/ffprocess/listener.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/colorpreview.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/colorpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/colorpreview.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/colorpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtext.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/drawtext.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtext.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/drawtext.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtextplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/drawtextplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtextplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/drawtextplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/dropshadowbox.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/dropshadowbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/dropshadowbox.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/dropshadowbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/fontpreview.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/fontpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/fontpreview.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/fontpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/textposition.cpp -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/textposition.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/drawtext/textposition.h -> qx11grab-0.4.12.tar.xz/src/filters/drawtext/textposition.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/fade/fade.cpp -> qx11grab-0.4.12.tar.xz/src/filters/fade/fade.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/fade/fade.h -> qx11grab-0.4.12.tar.xz/src/filters/fade/fade.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/fade/fadeplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/fade/fadeplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/fade/fadeplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/fade/fadeplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/qx11grabplugins.cpp -> qx11grab-0.4.12.tar.xz/src/filters/qx11grabplugins.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/qx11grabplugins.h -> qx11grab-0.4.12.tar.xz/src/filters/qx11grabplugins.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdar.cpp -> qx11grab-0.4.12.tar.xz/src/filters/setdar/setdar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdar.h -> qx11grab-0.4.12.tar.xz/src/filters/setdar/setdar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdarplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/setdar/setdarplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdarplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/setdar/setdarplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharp.cpp -> qx11grab-0.4.12.tar.xz/src/filters/unsharp/unsharp.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharp.h -> qx11grab-0.4.12.tar.xz/src/filters/unsharp/unsharp.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharpplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/unsharp/unsharpplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharpplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/unsharp/unsharpplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/imagepreview.cpp -> qx11grab-0.4.12.tar.xz/src/filters/watermark/imagepreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/imagepreview.h -> qx11grab-0.4.12.tar.xz/src/filters/watermark/imagepreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/openimagedialog.cpp -> qx11grab-0.4.12.tar.xz/src/filters/watermark/openimagedialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/openimagedialog.h -> qx11grab-0.4.12.tar.xz/src/filters/watermark/openimagedialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermark.cpp -> qx11grab-0.4.12.tar.xz/src/filters/watermark/watermark.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermark.h -> qx11grab-0.4.12.tar.xz/src/filters/watermark/watermark.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermarkplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/watermark/watermarkplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermarkplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/watermark/watermarkplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcam.cpp -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcam.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcam.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcam.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamcaptureframes.cpp -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamcaptureframes.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamcaptureframes.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamcaptureframes.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdevicechooser.cpp -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamdevicechooser.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdevicechooser.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamdevicechooser.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdeviceinfo.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamdeviceinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamplugin.cpp -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamplugin.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcamplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcampreview.cpp -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcampreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcampreview.h -> qx11grab-0.4.12.tar.xz/src/filters/webcam/webcampreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/highlighter.cpp -> qx11grab-0.4.12.tar.xz/src/logviewer/highlighter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/highlighter.h -> qx11grab-0.4.12.tar.xz/src/logviewer/highlighter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/logviewer.cpp -> qx11grab-0.4.12.tar.xz/src/logviewer/logviewer.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/logviewer.h -> qx11grab-0.4.12.tar.xz/src/logviewer/logviewer.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/textview.cpp -> qx11grab-0.4.12.tar.xz/src/logviewer/textview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/logviewer/textview.h -> qx11grab-0.4.12.tar.xz/src/logviewer/textview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/main.cpp -> qx11grab-0.4.12.tar.xz/src/main.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/mainwindow.cpp -> qx11grab-0.4.12.tar.xz/src/mainwindow.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -124,12 +124,12 @@ // MetaData { m_metaData = new MetaData ( m_toolBox ); m_metaData->setToolTip ( QString::fromUtf8 ( "-metadata" ) ); - m_toolBox->addItem ( m_metaData, cfg->themeIcon ( "user-properties", "user-identity" ), trUtf8 ( "Metadata" ) ); + m_toolBox->addItem ( m_metaData, cfg->themeIcon ( "document-properties", "user-identity" ), trUtf8 ( "Metadata" ) ); // } MetaData // vCodec { m_videoEditor = new VideoTableEditor ( m_toolBox ); - m_toolBox->addItem ( m_videoEditor, cfg->themeIcon ( "tool-animator", "qx11grab" ), trUtf8 ( "Video" ) ); + m_toolBox->addItem ( m_videoEditor, cfg->themeIcon ( "video-display", "qx11grab" ), trUtf8 ( "Video" ) ); // } vCodec // aCodec { @@ -597,9 +597,17 @@ // Decoder commandLine << "-dcodec" << "copy"; - // Audio System + // Audio Device System if ( m_audioGroupBox->isChecked() ) + { + // Twitch + if ( cfg->value ( "Twitch/Enabled", false ).toBool() ) + { + commandLine << "-f" << cfg->value ( "Twitch/AudioEngine" ).toString(); + commandLine << "-i" << cfg->value ( "Twitch/AudioDevice" ).toString(); + } commandLine << cfg->getAudioDeviceCommand(); + } quint32 pthreads = cfg->value ( QLatin1String ( "Threads" ), 0 ).toUInt(); if ( pthreads > 0 ) @@ -616,14 +624,14 @@ // Video Options commandLine << m_videoEditor->getCmd(); + // Audio Encoder Settings + if ( m_audioGroupBox->isChecked() ) + commandLine << m_audioEditor->getCmd(); + // Meta Daten if ( m_metaData->isChecked() ) commandLine << m_metaData->getCmd ( videoCodec() ); - // Audio Aufnahme - if ( m_audioGroupBox->isChecked() ) - commandLine << m_audioEditor->getCmd(); - m_commandPreview->setCommandLine ( commandLine ); cfg->setValue ( QLatin1String ( "SoundRecording" ), m_audioGroupBox->isChecked() );
View file
qx11grab-0.4.10.tar.bz2/src/mainwindow.h -> qx11grab-0.4.12.tar.xz/src/mainwindow.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/menubar.cpp -> qx11grab-0.4.12.tar.xz/src/menubar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -85,7 +85,9 @@ m_menuActions->addAction ( m_actionSave ); m_actionLoad = m_menuActions->addAction ( trUtf8 ( "Load" ) ); - m_actionLoad->setIcon ( Settings::themeIcon ( "edit-redo" ) ); + /*: ToolTip */ + m_actionLoad->setStatusTip ( trUtf8 ( "Load Configuration Settings" ) ); + m_actionLoad->setIcon ( Settings::themeIcon ( "preferences-other" ) ); m_actionLoad->setShortcut ( QKeySequence::Undo ); m_actionRefresh = refreshAction ( this, true ); @@ -100,7 +102,7 @@ m_actionPrEditor = m_menuActions->addAction ( trUtf8 ( "Presets Editor" ) ); /*: ToolTip */ m_actionPrEditor->setStatusTip ( trUtf8 ( "Open Presets Editor" ) ); - m_actionPrEditor->setIcon ( Settings::themeIcon ( "document-edit", "menu-editors" ) ); + m_actionPrEditor->setIcon ( Settings::themeIcon ( "accessories-text-editor", "menu-editors" ) ); m_menuActions->addSeparator(); @@ -131,7 +133,7 @@ // About m_menuHelp->addSeparator(); - QAction* m_aboutQX11Grab = m_menuHelp->addAction ( Settings::themeIcon ( "qx11grab" ), + QAction* m_aboutQX11Grab = m_menuHelp->addAction ( Settings::themeIcon ( "help-about" ), trUtf8 ( "About QX11Grab" ) ); QAction* m_aboutQt4 = m_menuHelp->addAction ( helpIcon, trUtf8 ( "About Qt4" ) ); @@ -227,7 +229,7 @@ ac->setObjectName ( QLatin1String ( "bookmarkCreateAction" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Open create Bookmark Dialog" ) ); - ac->setIcon ( Settings::themeIcon ( "bookmark-new" ) ); + ac->setIcon ( Settings::themeIcon ( "document-properties" ) ); ac->setShortcut ( Qt::CTRL + Qt::Key_B ); return ac; } @@ -238,7 +240,7 @@ ac->setObjectName ( QLatin1String ( "bookmarkRemoveAction" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Open delete Bookmark Dialog" ) ); - ac->setIcon ( Settings::themeIcon ( "bookmarks-organize" ) ); + ac->setIcon ( Settings::themeIcon ( "edit-delete" ) ); return ac; } @@ -295,7 +297,7 @@ ac->setObjectName ( QLatin1String ( "actionGrabbing" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "get Size from Window" ) ); - ac->setIcon ( Settings::themeIcon ( "window-duplicate" ) ); + ac->setIcon ( Settings::themeIcon ( "view-fullscreen" ) ); if ( shortcut ) ac->setShortcut ( Qt::CTRL + Qt::Key_G ); return ac; @@ -308,7 +310,7 @@ ac->setObjectName ( QLatin1String ( "actionRubberband" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "swap rubberband view" ) ); - ac->setIcon ( Settings::themeIcon ( "view-grid" ) ); + ac->setIcon ( Settings::themeIcon ( "view-restore" ) ); if ( shortcut ) ac->setShortcut ( Qt::CTRL + Qt::SHIFT + Qt::Key_R ); return ac; @@ -362,7 +364,7 @@ ac->setObjectName ( QLatin1String ( "actionMinimize" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Minimize to Systray" ) ); - ac->setIcon ( Settings::themeIcon ( "minimize" ) ); + ac->setIcon ( Settings::themeIcon ( "view-sort-ascending" ) ); if ( shortcut ) ac->setShortcut ( Qt::CTRL + Qt::Key_H ); return ac; @@ -375,7 +377,7 @@ ac->setObjectName ( QLatin1String ( "actionMinimize" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Minimize to Systray" ) ); - ac->setIcon ( Settings::themeIcon ( "maximize" ) ); + ac->setIcon ( Settings::themeIcon ( "view-sort-descending" ) ); if ( shortcut ) ac->setShortcut ( Qt::CTRL + Qt::Key_M ); return ac; @@ -414,7 +416,7 @@ ac->setObjectName ( QLatin1String ( "actionRefresh" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Refresh Commandline Preview" ) ); - ac->setIcon ( Settings::themeIcon ( "view-refresh" ) ); + ac->setIcon ( Settings::themeIcon ( "document-revert" ) ); if ( shortcut ) ac->setShortcut ( QKeySequence::Refresh ); return ac; @@ -427,7 +429,7 @@ ac->setObjectName ( QLatin1String ( "actionLogfile" ) ); /*: ToolTip */ ac->setStatusTip ( trUtf8 ( "Open FFmpeg Protocoll" ) ); - ac->setIcon ( Settings::themeIcon ( "view-list-text" ) ); + ac->setIcon ( Settings::themeIcon ( "appointment-new" ) ); if ( shortcut ) ac->setShortcut ( QKeySequence::Refresh ); return ac;
View file
qx11grab-0.4.10.tar.bz2/src/menubar.h -> qx11grab-0.4.12.tar.xz/src/menubar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/messanger/icon_p.h -> qx11grab-0.4.12.tar.xz/src/messanger/icon_p.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/messanger/messanger.cpp -> qx11grab-0.4.12.tar.xz/src/messanger/messanger.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/messanger/messanger.h -> qx11grab-0.4.12.tar.xz/src/messanger/messanger.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/messanger/messanger_p.h -> qx11grab-0.4.12.tar.xz/src/messanger/messanger_p.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/navigator.cpp -> qx11grab-0.4.12.tar.xz/src/navigator.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/navigator.h -> qx11grab-0.4.12.tar.xz/src/navigator.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/playeraction.cpp -> qx11grab-0.4.12.tar.xz/src/playeraction.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/playeraction.h -> qx11grab-0.4.12.tar.xz/src/playeraction.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/filesavedialog.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/filesavedialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/filesavedialog.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/filesavedialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetedit.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetedit.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditlayout.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/preseteditlayout.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditlayout.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/preseteditlayout.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditor.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/preseteditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditor.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/preseteditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetscombobox.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetscombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetscombobox.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetscombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetselector.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetselector.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/presetselector.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/presetselector.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/syntaxhighlight.cpp -> qx11grab-0.4.12.tar.xz/src/preseteditor/syntaxhighlight.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/preseteditor/syntaxhighlight.h -> qx11grab-0.4.12.tar.xz/src/preseteditor/syntaxhighlight.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/CMakeLists.txt -> qx11grab-0.4.12.tar.xz/src/settings/CMakeLists.txt
Changed
@@ -2,6 +2,11 @@ ADD_SUBDIRECTORY (extensionselecter) +SET (Q_JSON_LIB "") +IF(QJSON_FOUND) +SET (Q_JSON_LIB "-lqjson") +ENDIF(QJSON_FOUND) + SET(_subproject "Settings") SET (_subproject_SOURCES @@ -20,6 +25,7 @@ iconthemeselector.cpp graphicsengineselecter.cpp threadsspinbox.cpp + twitch.cpp ) SET (_subproject_HEADERS @@ -37,6 +43,7 @@ iconthemeselector.h graphicsengineselecter.h threadsspinbox.h + twitch.h ) SET (_subproject_NOMOC_HEADERS @@ -72,6 +79,8 @@ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${Q_JSON_LIB} ExtensionSelecter )
View file
qx11grab-0.4.10.tar.bz2/src/settings/abstractconfigwidget.cpp -> qx11grab-0.4.12.tar.xz/src/settings/abstractconfigwidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/abstractconfigwidget.h -> qx11grab-0.4.12.tar.xz/src/settings/abstractconfigwidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/configdialog.cpp -> qx11grab-0.4.12.tar.xz/src/settings/configdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,6 +26,7 @@ #include "extraoptions.h" #include "configextensions.h" #include "configrubberband.h" +#include "twitch.h" /* QtCore */ #include <QtCore/QDebug> @@ -85,7 +86,11 @@ m_configRubberband = new ConfigRubberband ( m_stackedWidget ); m_stackedWidget->insertWidget ( index, m_configRubberband ); - insertMenuItem ( index++, trUtf8 ( "Rubberband" ), "grid" ); + insertMenuItem ( index++, trUtf8 ( "Rubberband" ), "view-grid" ); + + m_configTwitch = new Twitch ( m_stackedWidget ); + m_stackedWidget->insertWidget ( index, m_configTwitch ); + insertMenuItem ( index++, trUtf8 ( "Twitch" ), "menu-multimedia-tv" ); // } End: insertItems m_buttonBox = new QDialogButtonBox ( Qt::Horizontal, this ); @@ -158,6 +163,10 @@ m_configRubberband->load ( cfg ); // } Gummiband + // Twitch { + m_configTwitch->load ( cfg ); + // } Twitch + setWindowModified ( false ); } @@ -192,6 +201,10 @@ m_configRubberband->save ( cfg ); // } Gummiband + // Twitch { + m_configTwitch->save ( cfg ); + // } Twitch + accept(); }
View file
qx11grab-0.4.10.tar.bz2/src/settings/configdialog.h -> qx11grab-0.4.12.tar.xz/src/settings/configdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -42,6 +42,7 @@ class ExtraOptions; class ConfigExtensions; class ConfigRubberband; +class Twitch; class ConfigDialog : public QDialog { @@ -58,6 +59,7 @@ ExtraOptions* m_extraOptions; ConfigExtensions* m_configExtensions; ConfigRubberband* m_configRubberband; + Twitch* m_configTwitch; QListWidget* m_listWidget; QDialogButtonBox* m_buttonBox;
View file
qx11grab-0.4.10.tar.bz2/src/settings/configextensions.cpp -> qx11grab-0.4.12.tar.xz/src/settings/configextensions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/configextensions.h -> qx11grab-0.4.12.tar.xz/src/settings/configextensions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/configrubberband.cpp -> qx11grab-0.4.12.tar.xz/src/settings/configrubberband.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/configrubberband.h -> qx11grab-0.4.12.tar.xz/src/settings/configrubberband.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensioncodeccombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensioncodeccombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiondelegation.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiondelegation.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiondelegation.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiondelegation.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionlineedit.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensionlineedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionlineedit.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensionlineedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionscombobox.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensionscombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionscombobox.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensionscombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontable.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiontable.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontable.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiontable.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontablemodel.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiontablemodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontablemodel.h -> qx11grab-0.4.12.tar.xz/src/settings/extensionselecter/extensiontablemodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/extraoptions.cpp -> qx11grab-0.4.12.tar.xz/src/settings/extraoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -165,10 +165,13 @@ if ( m_tableWidget->item ( r, 0 ) ) { QString key = m_tableWidget->item ( r, 0 )->data ( Qt::EditRole ).toString(); - QVariant value = m_tableWidget->item ( r, 1 )->data ( Qt::EditRole ); if ( key.isEmpty() ) continue; + QVariant value; + if ( m_tableWidget->item ( r, 1 ) ) + value = m_tableWidget->item ( r, 1 )->data ( Qt::EditRole ); + data.insert ( key, value ); } }
View file
qx11grab-0.4.10.tar.bz2/src/settings/extraoptions.h -> qx11grab-0.4.12.tar.xz/src/settings/extraoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/graphicsengineselecter.cpp -> qx11grab-0.4.12.tar.xz/src/settings/graphicsengineselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/graphicsengineselecter.h -> qx11grab-0.4.12.tar.xz/src/settings/graphicsengineselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthemeitem.cpp -> qx11grab-0.4.12.tar.xz/src/settings/iconthemeitem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthemeitem.h -> qx11grab-0.4.12.tar.xz/src/settings/iconthemeitem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthememodel.cpp -> qx11grab-0.4.12.tar.xz/src/settings/iconthememodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthememodel.h -> qx11grab-0.4.12.tar.xz/src/settings/iconthememodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthemeselector.cpp -> qx11grab-0.4.12.tar.xz/src/settings/iconthemeselector.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab/xhtmldbg project * -* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/iconthemeselector.h -> qx11grab-0.4.12.tar.xz/src/settings/iconthemeselector.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab/xhtmldbg project * -* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/loglevelcombobox.cpp -> qx11grab-0.4.12.tar.xz/src/settings/loglevelcombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/loglevelcombobox.h -> qx11grab-0.4.12.tar.xz/src/settings/loglevelcombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/mainfcuntions.cpp -> qx11grab-0.4.12.tar.xz/src/settings/mainfcuntions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/mainfcuntions.h -> qx11grab-0.4.12.tar.xz/src/settings/mainfcuntions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/outputedit.cpp -> qx11grab-0.4.12.tar.xz/src/settings/outputedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/outputedit.h -> qx11grab-0.4.12.tar.xz/src/settings/outputedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/settings.cpp -> qx11grab-0.4.12.tar.xz/src/settings/settings.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -262,6 +262,7 @@ * \param icon Titel ohne Erweiterung * \param broken Ausweich Titel * NOTE Ist abhängig von application.cpp Q_INIT_RESOURCE +* http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html */ const QIcon Settings::themeIcon ( const QString &icon, const QString &broken ) {
View file
qx11grab-0.4.10.tar.bz2/src/settings/settings.h -> qx11grab-0.4.12.tar.xz/src/settings/settings.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/targetswidget.cpp -> qx11grab-0.4.12.tar.xz/src/settings/targetswidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/targetswidget.h -> qx11grab-0.4.12.tar.xz/src/settings/targetswidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/threadsspinbox.cpp -> qx11grab-0.4.12.tar.xz/src/settings/threadsspinbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/settings/threadsspinbox.h -> qx11grab-0.4.12.tar.xz/src/settings/threadsspinbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.12.tar.xz/src/settings/twitch.cpp
Added
@@ -0,0 +1,178 @@ +/* +* This file is part of the qx11grab project +* +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Library General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Library General Public License for more details. +* +* You should have received a copy of the GNU Library General Public License +* along with this library; see the file COPYING.LIB. If not, write to +* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +*/ + +#include "twitch.h" +#include "version.h" +#include "audiodevicewidget.h" + +/* QtCore */ +#include <QtCore/QDebug> +#include <QtCore/QRegExp> + +/* QtGui */ +#include <QtGui/QGridLayout> +#include <QtGui/QLabel> +#include <QtGui/QCompleter> + +/* QtGui */ +#include <QtNetwork/QNetworkAccessManager> +#include <QtNetwork/QNetworkRequest> + +/* QJson */ +#include <qjson/parser.h> + +Twitch::Twitch ( QWidget * parent ) + : AbstractConfigWidget ( parent ) +{ + setObjectName ( QLatin1String ( "Twitch" ) ); + /*: GroupBoxTitle */ + setTitle ( trUtf8 ( "twitch.tv" ) ); + + QGridLayout* layout = new QGridLayout ( this ); + layout->setContentsMargins ( 0, 5, 0, 0 ); + layout->setObjectName ( QLatin1String ( "ConfigTwitch/Layout" ) ); + + Qt::Alignment labelAlignment = ( Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter ); + + int row = 0; + // begin:Config { + QLabel* txt_key = new QLabel ( this ); + txt_key->setText ( trUtf8 ( "Streaming Key:" ) ); + txt_key->setAlignment ( labelAlignment ); + layout->addWidget ( txt_key, row, 0, 1, 1 ); + + m_keyEdit = new QLineEdit ( this ); + m_keyEdit->setObjectName ( "Streamkey" ); + layout->addWidget ( m_keyEdit, row++, 1, 1, 1 ); + + QLabel* txt_server = new QLabel ( this ); + txt_server->setText ( trUtf8 ( "Server:" ) ); + txt_server->setAlignment ( labelAlignment ); + layout->addWidget ( txt_server, row, 0, 1, 1 ); + + m_serverEdit = new QLineEdit ( this ); + m_serverEdit->setObjectName ( "Server" ); + m_serverEdit->setToolTip ( trUtf8 ( "" ) ); + layout->addWidget ( m_serverEdit, row++, 1, 1, 1 ); + + m_serverList = new QComboBox ( this ); + layout->addWidget ( m_serverList, row++, 0, 1, 2 ); + + m_joinAudio = new QCheckBox ( trUtf8 ( "Always join micro output with system audio" ), this ); + m_joinAudio->setObjectName ( "Join" ); + m_joinAudio->setToolTip ( trUtf8 ( "Only available with pulseaudio" ) ); + layout->addWidget ( m_joinAudio, row++, 0, 1, 2 ); + + m_audioDeviceWidget = new AudioDeviceWidget ( this ); + m_audioDeviceWidget->setAudioDevice ( AudioDeviceWidget::PULSE ); + m_audioDeviceWidget->enableSimpleEdit ( true ); + layout->addWidget ( m_audioDeviceWidget, row++, 0, 1, 2 ); + // } end:Config + + QLabel* txt_info = new QLabel ( this ); + txt_info->setWordWrap ( true ); + txt_info->setText ( trUtf8 ( "Don't forget to add <b>amix</b> Filter with <i>-filter_complex</i> into Audiotable.<br/>Example: <i>\"[1:a][2:a]amix=inputs=2\"</i> to join Audio1/Audio2 Devices into single Stream!" ) ); + layout->addWidget ( txt_info, row++, 0, 1, 2 ); + + layout->setRowStretch ( row, 1 ); + setLayout ( layout ); + + init_rtmp_servers(); + + connect ( m_serverList, SIGNAL ( currentIndexChanged ( int ) ), + this, SLOT ( switchServer ( int ) ) ); +} + +void Twitch::init_rtmp_servers() +{ + QNetworkAccessManager* manager = new QNetworkAccessManager ( this ); + connect ( manager, SIGNAL ( finished ( QNetworkReply * ) ), + this, SLOT ( readyRead ( QNetworkReply * ) ) ); + QNetworkRequest req; + req.setUrl ( TWITCH_JSON_SERVERS ); + req.setRawHeader ( "Accept", "application/json" ); + manager->get ( req ); +} + +void Twitch::switchServer ( int _i ) +{ + m_serverEdit->setText ( m_serverList->itemData ( _i ).toString() ); +} + +void Twitch::readyRead ( QNetworkReply * _r ) +{ + QJson::Parser parser; + bool ok; + + if ( ( _r->error() != QNetworkReply::NoError ) || ( ! _r->isFinished() ) ) + return; + + // wget -O /tmp/ingests.js https://api.twitch.tv/kraken/ingests + // cat /tmp/ingests.js | json_pp + QByteArray _json = QByteArray::fromPercentEncoding ( _r->readAll() ); + QVariantMap result = parser.parse ( _json, &ok ).toMap(); + if ( !ok ) + { + qDebug() << Q_FUNC_INFO << parser.errorString(); + return; + } + + QStringList _cpl; + m_serverList->clear(); + foreach ( QVariant _item, result["ingests"].toList() ) + { + QVariantMap _arr = _item.toMap(); + if ( _arr["availability"].toUInt() == 1 ) + { + QString _sub = _arr["url_template"].toString(); + _sub.remove ( QRegExp ( "\\{stream_key\\}" ) ); + _cpl << _sub; + m_serverList->addItem ( _arr["name"].toString(), _sub ); + } + } + + QCompleter *_comp = new QCompleter ( _cpl, m_serverEdit ); + _comp->setCaseSensitivity ( Qt::CaseInsensitive ); + _comp->setCompletionMode ( QCompleter::PopupCompletion ); + m_serverEdit->setCompleter ( _comp ); +} + +void Twitch::load ( Settings * cfg ) +{ + m_keyEdit->setText ( cfg->value ( "Twitch/Streamkey", "" ).toString() ); + m_serverEdit->setText ( cfg->value ( "Twitch/Server", "rtmp://live-ams.twitch.tv/app/" ).toString() ); + m_joinAudio->setChecked ( cfg->value ( "Twitch/Join", false ).toBool () ); + m_audioDeviceWidget->setAudioEngine ( cfg->value ( "Twitch/AudioEngine", "pulse" ).toString() ); + m_audioDeviceWidget->setAudioDevice ( cfg->value ( "Twitch/AudioDevice", "" ).toString() ); +} + +void Twitch::save ( Settings * cfg ) +{ + cfg->setValue ( "Twitch/Enabled", ( ( !m_keyEdit->text().isEmpty() ) && m_joinAudio->isChecked() ) ); + cfg->setValue ( "Twitch/Streamkey", m_keyEdit->text() ); + cfg->setValue ( "Twitch/Server", m_serverEdit->text() ); + cfg->setValue ( "Twitch/Join", m_joinAudio->isChecked() ); + cfg->setValue ( "Twitch/AudioEngine", m_audioDeviceWidget->getAudioEngine() ); + cfg->setValue ( "Twitch/AudioDevice", m_audioDeviceWidget->getAudioDevice() ); +} + +Twitch::~Twitch() +{}
View file
qx11grab-0.4.12.tar.xz/src/settings/twitch.h
Added
@@ -0,0 +1,70 @@ +/* +* This file is part of the qx11grab project +* +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Library General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Library General Public License for more details. +* +* You should have received a copy of the GNU Library General Public License +* along with this library; see the file COPYING.LIB. If not, write to +* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +*/ + +#ifndef TWITCH_H +#define TWITCH_H + +/* QtCore */ +#include <QtCore/QObject> +#include <QtCore/QString> + +/* QtGui */ +#include <QtGui/QCheckBox> +#include <QtGui/QComboBox> +#include <QtGui/QLineEdit> +#include <QtGui/QWidget> + +/* QtNetwork */ +#include <QtNetwork/QNetworkReply> + +/* QX11Grab */ +#include "abstractconfigwidget.h" + +class AudioDeviceWidget; + +class Twitch : public AbstractConfigWidget +{ + Q_OBJECT + Q_CLASSINFO ( "Author", "Jürgen Heinemann (Undefined)" ) + Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) + + private: + QLineEdit* m_keyEdit; + QLineEdit* m_serverEdit; + QComboBox* m_serverList; + QCheckBox* m_joinAudio; + AudioDeviceWidget* m_audioDeviceWidget; + void init_rtmp_servers(); + + private Q_SLOTS: + void switchServer ( int ); + void readyRead ( QNetworkReply * ); + + public Q_SLOTS: + void load ( Settings * cfg ); + void save ( Settings * cfg ); + + public: + Twitch ( QWidget * parent = 0 ); + ~Twitch(); +}; + +#endif
View file
qx11grab-0.4.10.tar.bz2/src/systemtray.cpp -> qx11grab-0.4.12.tar.xz/src/systemtray.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/systemtray.h -> qx11grab-0.4.12.tar.xz/src/systemtray.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractedit.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstractedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractedit.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstractedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractselection.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstractselection.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractselection.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstractselection.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstracttableeditor.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstracttableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/abstracttableeditor.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/abstracttableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/audiotableeditor.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/audiotableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/audiotableeditor.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/audiotableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectable.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectable.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectable.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectable.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectabledelegate.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectabledelegate.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectabledelegate.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectabledelegate.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectablemodel.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectablemodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/codectablemodel.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/codectablemodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/defaultedit.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/defaultedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/defaultedit.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/defaultedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/filtermenu.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/filtermenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/filtermenu.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/filtermenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/selectacodecpresets.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/selectacodecpresets.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/selectacodecpresets.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/selectacodecpresets.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/selectvcodecpresets.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/selectvcodecpresets.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/selectvcodecpresets.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/selectvcodecpresets.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/videotableeditor.cpp -> qx11grab-0.4.12.tar.xz/src/tableeditor/videotableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tableeditor/videotableeditor.h -> qx11grab-0.4.12.tar.xz/src/tableeditor/videotableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/desktopinfo.cpp -> qx11grab-0.4.12.tar.xz/src/tapping/desktopinfo.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/desktopinfo.h -> qx11grab-0.4.12.tar.xz/src/tapping/desktopinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/desktoptapping.cpp -> qx11grab-0.4.12.tar.xz/src/tapping/desktoptapping.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/desktoptapping.h -> qx11grab-0.4.12.tar.xz/src/tapping/desktoptapping.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/rubberband.cpp -> qx11grab-0.4.12.tar.xz/src/tapping/rubberband.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/tapping/rubberband.h -> qx11grab-0.4.12.tar.xz/src/tapping/rubberband.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/toolbar.cpp -> qx11grab-0.4.12.tar.xz/src/toolbar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/toolbar.h -> qx11grab-0.4.12.tar.xz/src/toolbar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/cspinbox.cpp -> qx11grab-0.4.12.tar.xz/src/utils/cspinbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/cspinbox.h -> qx11grab-0.4.12.tar.xz/src/utils/cspinbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/grabberinfo.cpp -> qx11grab-0.4.12.tar.xz/src/utils/grabberinfo.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/grabberinfo.h -> qx11grab-0.4.12.tar.xz/src/utils/grabberinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/metadata.cpp -> qx11grab-0.4.12.tar.xz/src/utils/metadata.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/metadata.h -> qx11grab-0.4.12.tar.xz/src/utils/metadata.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/screenbox.cpp -> qx11grab-0.4.12.tar.xz/src/utils/screenbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/screenbox.h -> qx11grab-0.4.12.tar.xz/src/utils/screenbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/screencombobox.cpp -> qx11grab-0.4.12.tar.xz/src/utils/screencombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/utils/screencombobox.h -> qx11grab-0.4.12.tar.xz/src/utils/screencombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2015 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/src/version.h.cmake -> qx11grab-0.4.12.tar.xz/src/version.h.cmake
Changed
@@ -24,6 +24,7 @@ /* QtCore */ #include <QtCore/QGlobalStatic> +#include <QtCore/QUrl> /** * @short Version @@ -40,4 +41,9 @@ */ #define QX11GRAB_DBUS_DOMAIN_NAME "@QX11GRAB_DBUS_DOMAIN_NAME@" +/** +* @short https://api.twitch.tv/kraken/ +*/ +#define TWITCH_JSON_SERVERS QUrl ( "@TWITCH_JSON_SERVERS@" ) + #endif
View file
qx11grab-0.4.10.tar.bz2/svg/position_bottom_center.svg -> qx11grab-0.4.12.tar.xz/svg/position_bottom_center.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_bottom_center.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_bottom_left.svg -> qx11grab-0.4.12.tar.xz/svg/position_bottom_left.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_bottom_left.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_bottom_rigth.svg -> qx11grab-0.4.12.tar.xz/svg/position_bottom_rigth.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_bottom_rigth.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_middle_center.svg -> qx11grab-0.4.12.tar.xz/svg/position_middle_center.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_middle_center.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_middle_left.svg -> qx11grab-0.4.12.tar.xz/svg/position_middle_left.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_middle_left.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_middle_right.svg -> qx11grab-0.4.12.tar.xz/svg/position_middle_right.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_middle_right.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_top_center.svg -> qx11grab-0.4.12.tar.xz/svg/position_top_center.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_top_center.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_top_left.svg -> qx11grab-0.4.12.tar.xz/svg/position_top_left.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_top_left.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_top_right.svg -> qx11grab-0.4.12.tar.xz/svg/position_top_right.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_top_right.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/svg/position_unknown.svg -> qx11grab-0.4.12.tar.xz/svg/position_unknown.svg
Changed
@@ -14,7 +14,7 @@ height="192" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="position_unknown.svg"> <defs id="defs4">
View file
qx11grab-0.4.10.tar.bz2/utils/cmake.sh -> qx11grab-0.4.12.tar.xz/utils/cmake.sh
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -21,9 +21,9 @@ ######################################################################################## target_project="qx11grab" -# ff_suffix=-av-9.1 -# ff_suffix=_10x -ff_suffix=-2.0 +# ff_suffix=-libav9 +# ff_suffix=-libav11 +ff_suffix=-2.5 if test -f $HJCMS_PROJECTS_DIR/projectconfigurations.sh ; then source $HJCMS_PROJECTS_DIR/projectconfigurations.sh
View file
qx11grab-0.4.10.tar.bz2/utils/commit.sh -> qx11grab-0.4.12.tar.xz/utils/commit.sh
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.12.tar.xz/utils/multicasting.sh
Added
@@ -0,0 +1,39 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## + +## https://trac.ffmpeg.org/wiki/AudioChannelManipulation +## n = 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320 +## -filter_complex "[1:a] [2:a] amerge=inputs=2,pan=stereo|c0<c0+c2|c1<c1+c3" \ +ffmpeg -xerror -loglevel info \ + -f x11grab -framerate 20 -video_size 1920x1018 -i :0.0+0,31 -dcodec copy \ + -f pulse -i Equalizer.monitor \ + -f pulse -i alsa_input.usb-C-Media_Electronics_Inc._USB_PnP_Sound_Device____-00-Headset.analog-mono \ + -threads 4 -report -cpuflags 3dnowext \ + -c:v libx264 -pix_fmt yuv420p -keyint_min 20 -tune film -preset medium \ + -g:v 40 -b:v 2000k -minrate:v 1750k -maxrate:v 2250k -bufsize 2000k \ + -c:a libfaac -ac:a 2 -b:a 224k -ar:a 48000 \ + -filter:v movie=/usr/share/icons/hicolor/64x64/apps/qx11grab.png[logo],[in][logo]overlay=main_w-overlay_w-12:main_h-overlay_h-8,setpts=PTS-STARTPTS[out] \ + -filter_complex "[1:a]volume=-20dB[a1],[2:a]volume=+1dB[a2],[a1][a2]amix=inputs=2" \ + -metadata title="Screencast Example" \ + -metadata author="Undefined Behavior" \ + -metadata copyright="CC BY-NC-SA 3.0" \ + -y /tmp/qx11grab-multible.mp4
View file
qx11grab-0.4.10.tar.bz2/utils/optimize-webm.sh -> qx11grab-0.4.12.tar.xz/utils/optimize-webm.sh
Changed
@@ -22,14 +22,16 @@ in="${1:-"dummy"}" +## https://support.google.com/youtube/answer/1722171?ref_topic=2888648 test -e ${in}.webm || { echo "FATAL: ${in}.webm not found" exit 1 } +echo "Optimized for YouTube Stereo 1080p" /usr/bin/ffmpeg -i ${in}.webm -threads 4 \ - -c:v libvpx -r:v 25 -s 1920x1080 -pix_fmt yuv420p -speed 2 -vpre 1080p \ - -c:a libvorbis -ar 44100 -b:a 256k -q:a 4 \ + -c:v libvpx -r:v 30 -s 1920x1080 -pix_fmt yuv420p -speed 2 -vpre 1080p \ + -c:a libvorbis -ar 44100 -b:a 512k -q:a 6 \ -metadata copyright='CC BY-NC-SA 3.0' \ -y /tmp/${in}_data.webm
View file
qx11grab-0.4.12.tar.xz/utils/twitch.tv.sh
Added
@@ -0,0 +1,41 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## + +## BUG ffmpeg-2.4 DTS -filter:a pan="5.1|c0=c1|c1=c0|c2=c2|c3=c3|c4=c4|c5=c5" \ + +## https://api.twitch.tv/kraken/ingests +TWITCH_DOMAIN=live-fra +STREAM_KEY= + +ffmpeg -xerror -loglevel info \ + -f x11grab -framerate 20 -video_size 1920x1018 -i :0.0+0,31 -dcodec copy \ + -f pulse -i Equalizer.monitor \ + -f pulse -i alsa_input.usb-C-Media_Electronics_Inc._USB_PnP_Sound_Device____-00-Headset.analog-mono \ + -threads 4 -report -cpuflags 3dnowext \ + -c:v libx264 -pix_fmt yuv420p -keyint_min 20 -tune film -preset medium \ + -g:v 40 -b:v 2000k -minrate:v 1750k -maxrate:v 2250k -bufsize 2000k \ + -c:a libfaac -ac:a 2 -b:a 192k -ar:a 48000 \ + -filter:v movie=/usr/share/icons/hicolor/64x64/apps/qx11grab.png[logo],[in][logo]overlay=main_w-overlay_w-12:main_h-overlay_h-8,setpts=PTS-STARTPTS[out] \ + -filter_complex "[1:a]volume=-20dB[a1],[2:a]volume=+1dB[a2],[a1][a2]amix=inputs=2" \ + -metadata author="Undefined Behavior" \ + -metadata copyright="CC BY-NC-SA 3.0" \ + rtmp://$TWITCH_DOMAIN.twitch.tv/app/$STREAM_KEY
View file
qx11grab-0.4.10.tar.bz2/utils/version_tests.sh -> qx11grab-0.4.12.tar.xz/utils/version_tests.sh
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.