Commit Graph

1307 Commits

Author SHA1 Message Date
Mathew Sutcliffe
e3ba42d152 fixed mistake in CNetworkVatlib::isDisconnected 2014-01-19 00:03:58 +00:00
Mathew Sutcliffe
26ef5ecd5a reverted commit:97dda0b because QMetaEnum is working fine, it just needed the Q_ENUMS macro too
made INetwork::connectionStatusToString a static method
2014-01-19 00:03:52 +00:00
Klaus Basan
1129891532 NOMINMAX fix after removal of some classes
https://dev.vatsim-germany.org/boards/22/topics/1417?r=1440#message-1440
2014-01-19 00:23:23 +01:00
Roland Winklmeier
cb112c6ddb Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client 2014-01-18 20:38:22 +01:00
Roland Winklmeier
da6e7a58a4 Add ifdefs arround native windows code to fix linux build
- There was some native windows code not properly covered by ifdefs.
- handlePushToTalk() is not yet implemented on linux. Add a dummy.
2014-01-18 20:12:02 +01:00
Klaus Basan
233bd51bfd Fixed ATIS bug, ATIS was applyIf as IndexAtisMessage (correct IndexAtis).
Also fixed appending CR.
2014-01-18 13:41:11 +01:00
Roland Winklmeier
6d10543d89 Fix endless voice transmission bug
The second if condition was always false, hence the pushToTalk boolean
was never resetted to false.
Add also mandatory and recommended respectively  calls to CallNextHookEx.
Otherwise other applications might run into problems.
Change virtual key VK_LCONTROL, since VK_CONTROL did not have any effect.
2014-01-17 21:07:53 +01:00
Klaus Basan
16dc959662 Fixed 4 gcc warnings (2x order, 1x explicit constructor, 1x GUI / from related) 2014-01-17 20:05:00 +01:00
Klaus Basan
72b7a7ab95 Added statusMessages (plural) as signal. This makes it easier
to send either single or multiple messages as required.

Along with the changes fixed some places where not all status
messages had been sent.

MainWindow connected with both signals (statusMessage, statusMessages)

Recreated DBus XML file
2014-01-17 18:42:34 +01:00
Klaus Basan
97dda0b499 The meta type based status to string conversion did not work,
as the metatype for the interface cannot be registered.

Changed to a simple static method, as it will be replaced by I18N
anyway sooner or later.
2014-01-17 18:38:06 +01:00
Klaus Basan
bddf54d770 Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client 2014-01-16 02:05:57 +01:00
Klaus Basan
34ef6e47ae Changed when m_updateTimer is started:
Now starts when connection is established, and stops when terminated.
Also added an extra check in update, as the session check is
not sufficient.
2014-01-16 02:03:46 +01:00
Klaus Basan
2cf097ae2e Receiving errors as status message results in
a pop up message now.
2014-01-15 23:52:22 +01:00
Klaus Basan
4f94f43e0d Setting own aircraft did not start the udpate timer.
Hence no updates from the network were received.
2014-01-15 23:51:15 +01:00
Roland Winklmeier
e36448f0a1 Replaced c++ standard integer types with Qt types
In order to be consistent, all standard integer types have been
replaced by the equivalent Qt ones in voice/audio code.
Projects covered
- BlackCore
- BlackMisc
- sample_voice_client

refs #99
2014-01-15 21:12:01 +01:00
Roland Winklmeier
f50fe098e3 Fix compile error in qFatal caused by type change to QString
msg was changed from type "const char*" to QString, but qFatal is
still expecting a "const char*" as its argument. Passed the QString
value to the qPrintable macro to fix it.
2014-01-15 20:39:15 +01:00
Klaus Basan
e5eb5bc972 Added new servers in the settings.
Europe C2 is now retired, I have added new severs for testing purposes.
C2 will be kept as test case for failing connects.

Remarks: Is will be saved in the settings in the future.
But we have no persistence for objects yet.
2014-01-15 20:11:00 +01:00
Klaus Basan
437eea6918 New signal/slot syntax
#96

In this particular case also solving the ASSERT
remaining from the pair programming session:

this->connect(this->m_network, SIGNAL(connectionStatusChanged(...
2014-01-15 16:21:17 +01:00
Klaus Basan
a0a082ab98 New signal/slot syntax
#96

In this particular case also solving the ASSERT
remaining from the pair programming sessiom:

this->connect(this->m_network, SIGNAL(connectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus)),
this, SLOT(psFsdConnectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus)));
Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect connectionStatusChanged");
2014-01-15 15:58:29 +01:00
Mathew Sutcliffe
917e1829d1 reviewed backlog INetwork and CContextNetwork changes from kbatclist
* INetwork setOwnAircraft slots
* ATIS received shimlib callback triggers separate VoiceRoom and LogoffTime signals
* INetwork statusMessage signal emitted in response to shimlib errors
* INetwork::ConnectionStatus added a DisconnectedError value and toString conversion
* INetwork::isConnected method
* Argument in CNetworkVatlib constructor to enable stealth or observer mode
* Update CLI sample, tests, and CContextNetwork accordingly
2014-01-14 23:30:21 +00:00
Mathew Sutcliffe
84ec984e0e removed CNetworkDummy as it was not being used 2014-01-14 23:30:00 +00:00
Klaus Basan
92276eb5bf Removed Connection state from the class,
as we have it now in INetwork. The connection state
from the shimblib should not be used in the client
code (abstraction from "drivers"), and in the past the
corresponding client state was declared here, but is now
one level deeper in INetwork.

A second change applied here is to use the signature
connectionStatusChanged(from, to), which allows the GUI
to better detect whether we login or logout without keeping
its own state.
2014-01-13 14:05:13 +01:00
Klaus Basan
cf47b670a6 Include order 2014-01-13 13:29:08 +01:00
Klaus Basan
959f171edf Changed to astyle format and added comment 2014-01-13 13:26:30 +01:00
Klaus Basan
11666da76a Mute functionality, corrected setting volume 2014-01-13 13:22:58 +01:00
Klaus Basan
cedc08eb3d Code based on Review with RW (userJoinedLeft).
Includes the discussed changes, added the mute methods,
and switchAudioOutput to enable/disable channel1/2
2014-01-13 03:19:36 +01:00
Klaus Basan
71c7318176 IsMuted method 2014-01-13 03:05:12 +01:00
Klaus Basan
1051a343aa New XML files for DBus, reflecting changes in the value classes 2014-01-13 01:59:54 +01:00
Mathew Sutcliffe
60ad43d291 INetwork: removed the five connectionStatus signals and added one signal with an enum argument to replace them.
Requested by Klaus, to ease the implementation of signal consumers.
2014-01-11 17:59:45 +00:00
Mathew Sutcliffe
784d93139b CTextMessage: fromCallsign and toCallsign become sender and recipient (to and from looked like conversion methods)
refs #81
2014-01-10 00:20:22 +00:00
Mathew Sutcliffe
b475d7eff1 INetwork builds up the ATIS as it is received, line-by-line, keeping this implementation detail more encapsulated
refs #81
2014-01-09 01:16:01 +00:00
Klaus Basan
f3758e5609 CContextNetwork builds up an ATIS as it is received, line-by-line
refs #81
2014-01-09 01:16:00 +00:00
Klaus Basan
ee43f5598d new contexts
refs #81
2014-01-09 01:15:59 +00:00
Mathew Sutcliffe
0bad7bb2e8 Contexts' getRuntime method uses static_cast instead of reinterpret_cast.
This required a few changes in include order and forward declarations to fix the real reason why reinterpret_cast was mistakenly used.

refs #81
2014-01-09 01:15:58 +00:00
Klaus Basan
1c1fdabd2e all voice changes from kbatclist branch
refs #81
2014-01-09 01:15:58 +00:00
Klaus Basan
bb61654a29 style and consistency:
* rename CStatusMessages to CStatusMessageList
* rename NetworkVatlib to CNetworkVatlib
* replace all occurrences of Realname with RealName (correct camel case)
* CSequence method corresponding to CList::append is push_back
* don't compile the qdbuscpp2xml metadata plugin by default
* CAircraftIcao string members always trimmed and capitalized
* added CComSystem::roundTo25KHz
* using epsilon comparison in a couple of places

refs #81
2014-01-09 01:15:56 +00:00
Mathew Sutcliffe
b5c3a5543f update CNetworkVatlib to new shimlib version with Create static member function
refs #81
2014-01-08 01:01:31 +00:00
Klaus Basan
0c01da4c8e Minor changes such as parameter warnings, added metatype registration for voice
refs #81
2014-01-08 01:01:26 +00:00
Roland Winklmeier
db4a3c5de4 Refactoring and clean up of voice implementation
refs #36
- Cleanup of library and sample code
- Completed now all signals in voice sample
- Fixed minor bugs with the user list
- TODO: Remove the VATSIM id from the user string

refs #81
2014-01-08 01:01:23 +00:00
Roland Winklmeier
0bae898db8 Added commands to voice sample. Test successfull refs #36 - Added commands to list input and output devices - Fixed some compiler errors on win - Voice confirmed working on windows and linux
Signed-off-by: Roland Winklmeier <roland.m.winklmeier@gmail.com>

refs #81
2014-01-08 01:01:20 +00:00
Roland Winklmeier
45b9f60444 Finalized voice vatlib implementation.
refs #36
- Implemented the rest of the methods
- Added more commands to the voice sample, to login to voice server
- Login successfull. However, no voice yet.

refs #81
2014-01-08 01:01:17 +00:00
Roland Winklmeier
f91525b65b Expanded voice sample to an interactive app
refs #36
- Based on the existing network sample, expanded the voice sample to an interactive app
- Implmenented commands: mic test, squelch test

refs #81
2014-01-08 01:01:10 +00:00
Roland Winklmeier
7292e265fb Added squelch and mic tests
refs #36

refs #81
2014-01-08 01:01:05 +00:00
Roland Winklmeier
b511f2ffaa Completed enumeration of audio devices
refs #36
- Cvatlib_Voice_Simple object is created and setup
- enumerates automatically a list of in and output devices.
- both device lists are accessable immediately
- added a sample demonstrating the interface so far

refs #81
2014-01-08 01:01:02 +00:00
Roland Winklmeier
158de31c0b Added CAudioDevice and cleaning up IVoice
refs #36
- Added a common class CAudioDevice encapsulating each audio device
- One subclass for input and output devices
- Changed IVoice interface slightly to better fit into the event flow

refs #81
2014-01-08 01:00:57 +00:00
Roland Winklmeier
fcebc44b02 Added class CVoiceRoom
refs #36
- This class encapsulates the information on a voice server room.
- It basically consists of the tuple hostname and channel

refs #81
2014-01-08 01:00:50 +00:00
Roland Winklmeier
62e1b411c5 Initial structure IVoiceClient and implementation
refs #36
- Added initial structure for IVoiceClient interface
- Added initial structure for the vatlib voice implementation

refs #81
2014-01-08 01:00:45 +00:00
Roland Winklmeier
f24d16019f Minor fixes for linux build
refs #36
- Fixed compiler error in context.cpp (is not used anymore, but was still annoying)
- GCC was complaining about the template definitons in blackgui. Removing typename fixed it.
- Fixed a bug in qmake. Unfortunately qmake mkspec was just linux-g++ (not linux-g++-64), so added this case.
- Fixed a PRE_TARGETDEPS bug
- QMake has strange behaviour with DBUS_ADAPTORS: include the header somewhere, otherwise it won't be generated.

refs #81
2014-01-08 01:00:39 +00:00
Klaus Basan
1f2a88e502 context classes, runtime classes, and related infrastructure
refs #81
2014-01-08 01:00:24 +00:00
Mathew Sutcliffe
c77951743e INetwork: refactor request/reply pattern and sending position updates to be more encapsulated
refs #81
2014-01-08 01:00:17 +00:00