Commit Graph

139 Commits

Author SHA1 Message Date
Klaus Basan
79f5b6fcd3 Added / prepared for state disconnecting:
Taking up the idea of MS (disconnecting),
and based on a real world issue where the transition state
of disconnecting was still handled as connected.
2014-02-05 23:16:19 +00:00
Klaus Basan
4a77ee5fc4 Added QAudioOutput to voice lib, as an approach to overcome #117 2014-02-05 23:16:08 +00:00
Klaus Basan
ffb09c0d4a Fixing typo (qWarning) in voice_vatlib 2014-02-05 23:16:00 +00:00
Klaus Basan
247bacb538 Handling of ATC disconnect in context, missing signal / slot connection 2014-02-05 23:15:58 +00:00
Klaus Basan
b8d87038a1 Fixed .pro files, typos in libblacksound (non win) 2014-02-05 23:15:51 +00:00
Klaus Basan
6485527062 Changed voice context so it can play SELCAL tones. This makes sense, as I can
use the device information of this context. Sound shall be played on the
same computer as the voice.

* Adjusted .pro file
* Methods for SELCAL in context
* New XML file (DBus)
* changed the place where I can obtain the current in/output device
2014-02-05 23:15:24 +00:00
Mathew Sutcliffe
bb4fe3f858 fixed missing delimiter in capabilities string when using stealth mode 2014-02-01 18:19:48 +00:00
Klaus Basan
291c52d4e0 Added check if network connection can be established
as discussed in #101
2014-01-31 02:13:38 +01:00
Mathew Sutcliffe
f8d6d092fb postpone variable definitions as long as possible (Effective C++ item 26) 2014-01-30 19:48:53 +00:00
Klaus Basan
3534d44d5e Resolve callsigns to user objects 2014-01-27 16:11:19 +01:00
Klaus Basan
b775a2c9d5 fixed comment 2014-01-26 23:15:56 +01:00
Klaus Basan
0fa421d8a6 Consider Channel Spacing (50, 25, 8.33kHz) for COM frequencies.
Deals with a special topic: While frequencies at VATSIM/flightsim are usually set in 25kHz spacing, some ATC stations (radar) require 8.33kHz tuning.
The now made extension handles this and allows to listen to a voice room even if the corresponding frequency is not exactly tuned in.

Example: EKDK_CTR 135,270 but needs to be tuned in as 135,275
2014-01-26 15:51:48 +01:00
Klaus Basan
1199f05fe2 Added LoginMode for login from GUI
* updated context method
* updated GUI, checkboxes for mode
* style sheet modified due to GUI update
2014-01-26 02:34:56 +01:00
Klaus Basan
1c0b714a18 Merge with master after fixes for containers,
refs #106
2014-01-26 00:09:30 +01:00
Klaus Basan
2c7ab19006 New DBus XML files generated 2014-01-25 23:36:48 +01:00
Mathew Sutcliffe
8561f17191 doxygen comments for all non-private members of INetwork, refs #91 2014-01-25 19:36:41 +00:00
Mathew Sutcliffe
7316fb8398 changed a couple more INetwork method names for consistency 2014-01-25 19:36:40 +00:00
Mathew Sutcliffe
ff3010931f connection status improvement, now we also check the return value of ConnectAndLogon
refs #101
2014-01-25 19:36:39 +00:00
Mathew Sutcliffe
0af8c9eb3e refs #100 Rationalization of INetwork signals and slots
* Naming convention: "preset" only when disconnected, "send" only when connected, "set" both
* Every asynchronous pair is named as in "sendFooQuery" and "fooReplyReceived"
* Moved LoginMode from CNetworkVatlib constructor to INetwork::presetLoginMode
* Callsign and ICAO codes can only be changed when disconnected, so have their own "preset" methods
** Callsign and ICAO parts of setOwnAircraft are therefore ignored
** CUser part of setOwnAircraft is ignored, in favour of the CUser part of presetServer
* CNetworkVatlib takes care of reconstructing m_net if the LoginMode is changed
2014-01-25 19:36:37 +00:00
Klaus Basan
0425ef5c6a Made BlackMisc::CStatusMessageList value no slot, no DBus XML signature shall be created.
A second value method tailored for DBus is the one called for DBus transfer and uses QDBusVariant.
2014-01-25 19:50:27 +01:00
Klaus Basan
6d5ad3ca75 Improved handling in CContextNetwork::getUsersForCallsigns
CContextNetwork::readAtcBookingsFromSource(), URL from settings
Helper method: BlackMisc::Settings::CSettingsNetwork getNetworkSettings()
2014-01-25 01:58:55 +01:00
Klaus Basan
ee5336e308 Formatting, Doxygen, Renaming 2014-01-25 01:56:37 +01:00
Klaus Basan
dd3803f9a9 Methods for CContextVoice::getCom1/2VoiceRoom
CContextVoice::getComVoiceRoomsWithAudioStatus() to const
2014-01-25 01:53:38 +01:00
Klaus Basan
36bab20f58 Updated CVoiceVatlib::getComVoiceRoomsWithAudioStatus() to const
Callsign split for user onRoomUserReceived
Check in CVoiceVatlib::addTemporaryCallsignForRoom
2014-01-25 01:51:54 +01:00
Klaus Basan
0f3d4666fa Comments / order of methods
* Reordered methods a bit
* Fixed Doxygen
* Removed unwanted comments
2014-01-21 17:49:21 +01:00
Klaus Basan
cffb732a94 Changed
* to CCallsignList
* from QString to CCallsign

Added:
* Method to get users, and
* users for callsigns

Fixed some Doxygen comments along with the changes
2014-01-21 17:46:55 +01:00
Klaus Basan
0e519dbeff Fixed Doxygen 2014-01-21 17:44:24 +01:00
Klaus Basan
17b6789d4e Changed voice to
* CCallsignList
* CCallsign (replaced QString)
* fixed Doxygen comments
2014-01-21 16:42:53 +01:00
Klaus Basan
3af1711045 Fixed Doxygen/include 2014-01-21 16:40:53 +01:00
Klaus Basan
3769ad1e65 Added methods getUsers / getUsersForCallsigns 2014-01-21 01:59:44 +01:00
Klaus Basan
06572def1a Renamed private slot, to better fit naming scheme 2014-01-21 01:45:08 +01:00
Klaus Basan
5bf3fb2fdf Some preparation / formatting before starting 2014-01-20 23:15:22 +01:00
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