Commit Graph

6417 Commits

Author SHA1 Message Date
Mikkel Krautz
be79bffe10 Merge PR #2703: Qt 4-related FTBFS issues 2016-12-08 22:47:09 +01:00
Mikkel Krautz
74f5930e1c *.pro: use 'linux*' instead of 'linux' for Linux conditionals.
This makes the check Qt 4-compatible.
2016-12-08 22:41:24 +01:00
Mikkel Krautz
704069eb37 DeveloperConsole: drop QPointer::clear() call. It is unnecessary, and the clear() method is Qt 5-only. 2016-12-08 22:40:11 +01:00
Davide Beatrici
6bad7ae403 plugins/rl: update plugin to work with version 1.25
Game version: 1.25
https://rocketleaguegame.com/news/patch-notes-v1-25
2016-12-08 16:28:09 +01:00
Mikkel Krautz
6ac0553add Merge PR #2698: Add Developer Console to Mumble 2016-12-04 19:06:43 +01:00
Mikkel Krautz
f62af9a91c Add Developer Console to Mumble, where users can inspect Mumble's log output.
We already log to Windows's debug log, but this is a little more
accessible for regular users and developers alike. (Sometimes, you don't
have DebugView handy...)
2016-12-04 18:56:27 +01:00
Mikkel Krautz
ab3589731b Mumble: add os_unix.cpp, with LogEmitter support. 2016-12-04 18:56:27 +01:00
Mikkel Krautz
a45bf7352d os_macx.mm: add LogEmitter support. 2016-12-04 18:56:27 +01:00
Mikkel Krautz
967e93e17f Add LogEmitter to Mumble and use it in os_win.cpp.
This is in preparation for the Developer Console.
2016-12-04 18:56:27 +01:00
Mikkel Krautz
681ecf60c0 Merge PR #2697: Refactor LogEmitter from Murmur into its own file in src/. 2016-12-04 13:28:02 +01:00
Mikkel Krautz
cd8f6b75e0 Refactor LogEmitter from Murmur into its own file in src/.
It's a natural refactoring and it'd be nice to be able to
use LogEmitter in Mumble as well.
2016-12-04 13:26:46 +01:00
Mikkel Krautz
ec0ed4efca Merge PR #2696: 3rdparty/opus-build: update verison references in config.h for Unix-like systems to 1.1.3. 2016-12-04 13:16:01 +01:00
Mikkel Krautz
0502f612c9 3rdparty/opus-build: update verison references in config.h for Unix-like systems to 1.1.3. 2016-12-04 13:15:02 +01:00
Mikkel Krautz
c722cd1022 Merge PR #2695: 3rdparty/opus-src: update to 1.1.3. 2016-12-04 13:11:58 +01:00
Mikkel Krautz
94493ac00f 3rdparty/opus-src: update to 1.1.3.
This updates Opus to our mumble-voip/opus 1.1.3+msvc2013.3-alignment
branch.

Fixes mumble-voip/mumble#2146
2016-12-04 13:10:14 +01:00
Mikkel Krautz
e596b72b9e Merge PR #2694: ConfigDialog_macx, mumble.pro: extra cleanups after removal in PR #2693. 2016-12-04 00:35:34 +01:00
Mikkel Krautz
95a666d855 ConfigDialog_macx, mumble.pro: extra cleanups after removal in PR #2693.
These were accidently forgotten the first time around.
2016-12-03 22:55:15 +01:00
Mikkel Krautz
7dd03f3959 Merge PR #2693: ConfigDiaglog_macx: remove, now that we default to the new Mumble theme. 2016-12-03 22:51:43 +01:00
Mikkel Krautz
599bd1b35a ConfigDiaglog_macx: remove, now that we default to the new Mumble theme.
Beyond removing the macOS-specific ConfigDialog, this also
removes the use of private Qt API for the macOS version of
Mumble.
2016-12-03 22:50:03 +01:00
Mikkel Krautz
5998cc0afc Merge PR #2692: os_win: remove MumbleHWNDForQWidget, add mumble_mw_hwnd. 2016-12-03 20:25:30 +01:00
Mikkel Krautz
5075b6c495 os_win: remove MumbleHWNDForQWidget, add mumble_mw_hwnd.
This commit removes MumbleHWNDForQWidget -- the only user of
private Qt API in Mumble on Windows.

It is replaced with a variable, mumble_hw_hwnd, which gets
filled out in main.cpp just after creating MainWindow.

Most MumbleHWNDForQWidget() uses were for g.mw, so the change
makes sense. The ones that weren't have been changed to use it,
or removed. Most of the removed instances are g.ocIntercept-related,
which is already broken beyond repair in Qt 5.
2016-12-03 18:49:33 +01:00
Mikkel Krautz
aa263e92a2 Merge PR #2691: mumble.pro: don't add to QTPLUGIN if we're on a Qt with auto-plugin support. 2016-12-03 16:16:52 +01:00
Mikkel Krautz
4bcd067e79 mumble.pro: don't add to QTPLUGIN if we're on a Qt with auto-plugin support.
Qt 5.3 introduced a feature where it'll automatically fill out QTPLUGIN
with appropriate auto-detected plugins for TEMPLATE=app.

This commit avoids adding entries to QTPLUGIN if we detect we're on a
Qt version that automatically fills out QTPLUGIN.

For Windows static builds, we don't use TEMPLATE=app, so for that
platform, we have to fill out QTPLUGIN in any case.
2016-12-03 15:25:44 +01:00
Mikkel Krautz
d15ca88770 Merge PR #2690: qt.pri: introduce QT_VERSION_INT for easier version comparisons in qmake files. 2016-12-03 15:12:12 +01:00
Mikkel Krautz
48b8ef7b08 qt.pri: introduce QT_VERSION_INT for easier version comparisons in qmake files.
This introduces a new variable, QT_VERSION_INT, which allows
qmake files to more easily do Qt version checks.

Previosly, code would chain greaterThan/equals/lessThan with
logical ands for QT_MAJOR_VERSION and QT_MINOR_VERSION.

That worked OK, but was a little verbose, and is inconvenient
if you want to use a QT_VERSION check alongside other conditions
in a conditional.

The QT_VERSION_INT is a string variable is of the form:

  Qt 5.0.0:   50000
  Qt 5.6.1:   50601

it is base 10, and can be used with qmake's comparison operators
like so:

  greaterThan(QT_VERSION_INT, 50600) {
    // Do stuff for Qt > 5.6
  }

This commit also removes our own copies of QT_MAJOR_VERSION
and QT_MINOR_VERSION. These are provided by mkspecs/qconfig.pri,
and have been since (at least) Qt 4. So they're already available.
We don't need to provide them. Our method of fetching them was also
buggy due to Qt 4 compatibility - so that's fixed now.
2016-12-03 15:00:27 +01:00
Mikkel Krautz
6fe920b263 Merge PR #2689: mumble.pro: only use qico on Windows. 2016-12-03 13:55:18 +01:00
Mikkel Krautz
7a450721f2 mumble.pro: only use qico on Windows. 2016-12-03 13:54:18 +01:00
Mikkel Krautz
eda8adecf6 Merge PR #2688: mumble.pro: refactor handling of accessiblewidgets plugin. 2016-12-03 13:51:46 +01:00
Mikkel Krautz
67945fd18c mumble.pro: refactor handling of accessiblewidgets plugin. 2016-12-03 13:51:03 +01:00
Mikkel Krautz
06d3785ac7 Merge PR #2687: Settings: add workaround for macOS "@Variant(" bug. 2016-12-02 23:52:52 +01:00
Mikkel Krautz
c6029e6fbe Settings: add workaround for macOS "@Variant(" bug.
Qt expects to be able to write NUL bytes in strings
serialized via QSettings. macOS Sierra broke this.

We've since backported a fix from Qt master into
our buildenv, and the bug is fixed.

This commit adds a workaround for users whose clients
have already written 'bad' config files on macOS.

If a bad config value is detected, it is skipped and
the default is used instead.
2016-12-02 23:49:26 +01:00
Mikkel Krautz
c45298e445 Merge PR #2685: MainWindow: disable MainWindow::changeEvent on macOS; it causes Mumble to be non-interactive after restoring from being minimized. 2016-12-02 00:07:42 +01:00
Mikkel Krautz
0f170bfa61 MainWindow: disable MainWindow::changeEvent on macOS; it causes Mumble to be non-interactive after restoring from being minimized.
Fixes mumble-voip/mumble#2171
2016-12-02 00:06:36 +01:00
Mikkel Krautz
9b4ee063e5 Merge PR #2682: main, SocketRPC: add 'togglemute' and 'toggledeaf' RPC commands. 2016-12-01 21:31:41 +01:00
Mikkel Krautz
541ac08f87 main, SocketRPC: add 'togglemute' and 'toggledeaf' RPC commands. 2016-12-01 21:30:58 +01:00
Mikkel Krautz
8aa2558e42 Merge PR #2681: Audio: start qtLastFetch timer in LoopUser to fix local loopback. 2016-12-01 21:14:35 +01:00
Mikkel Krautz
f7c40bd0ca Audio: start qtLastFetch timer in LoopUser to fix local loopback. 2016-12-01 21:07:55 +01:00
Mikkel Krautz
acd664a0d8 Merge PR #2673: ffxiv_x64 Plugin: Add a plugin for Final Fantasy XIV DX11/x64 2016-12-01 09:35:41 +01:00
Mikkel Krautz
f1b901ee55 Merge PR #2677: Transifex translation update 2016-12-01 09:33:38 +01:00
MumbleTransifexBot
1ba6906b96 Transifex translation update
Mode: default
Minimum percent translated: 0
Matched 41 languages
2016-11-30 01:27:39 +00:00
Arthur Moore
84c2ae28dd ffxiv_x64 Plugin: Add a plugin for Final Fantasy XIV x64
Use ffxiv.cpp to provide both plugins
2016-11-29 18:01:13 -05:00
Mikkel Krautz
0a58100cfc Merge PR #2675: Transifex translation update 2016-11-29 09:20:23 +01:00
MumbleTransifexBot
80353bf728 Transifex translation update
Mode: default
Minimum percent translated: 0
Matched 41 languages
2016-11-29 01:27:36 +00:00
Mikkel Krautz
2a106e19c7 Merge PR #2674: Mumble: convert AudioInputPtr and AudioOutputPtr to use QSharedPointer instead of boost::shared_ptr. 2016-11-28 00:29:22 +01:00
Mikkel Krautz
b676712c8b Mumble: convert AudioInputPtr and AudioOutputPtr to use QSharedPointer instead of boost::shared_ptr.
QSharedPointer is thread-safe and atomic, while boost::shared_ptr isn't.

For some audio systems, this is necessary for proper implementation (for
example, an audio system where AudioOutput runs the show, and AudioInput
is simply 'fed' data from AudioOutput -- like my upcoming 'sndio' backend).

Most of this commit is straight-forward. Most of the change is simply
renaming the types and fixing up uses of boost::shared_ptr::get() to
use QSharedPointer::data() instead. Some places also use operator bool()
now. For Qt 4 compatibility, we also no longer use the restet method of
the shared pointer, instead preferring clear() which is available in both
Qt 4 and Qt 5.

In Audio.cpp, in stop(), stopInput() and stopOutput(), the
boost::shared_ptr-based code used the unique() method on
boost::shared_ptr. That doesn't exist for QSharedPointer,
so we emulate the old behavior by keeping a QWeakPointer to
the object around. Once the weak pointer is no longer valid,
we know the AudioInput/AudioOutput object has been fully
destroyed.
2016-11-28 00:13:01 +01:00
Mikkel Krautz
0bc6d7d43b Merge PR #2672: installer: add ffxiv plugin to the installer. 2016-11-27 22:23:47 +01:00
Mikkel Krautz
5fc3721fd1 installer: add ffxiv plugin to the installer. 2016-11-27 22:23:11 +01:00
Mikkel Krautz
8bbb34d7c1 Merge PR #2653: Add plugin for Final Fantasy XIV 2016-11-27 22:21:10 +01:00
Arthur Moore
07308dceac ffxiv Plugin: Add a plugin for Final Fantasy XIV
This only supports the DirectX 9 version of the game.
2016-11-27 15:55:45 -05:00
Mikkel Krautz
0df5c64d57 Merge PR #2671: Split mumble_flags.qrc into seperate files to reduce .cpp size for older compilers. 2016-11-27 13:56:57 +01:00