Ref T739, removed voice room functions from context and UI

src/blackcore/airspacemonitor.cpp

@@ -20,7 +20,6 @@
 #include "blackmisc/aviation/modulator.h"
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/aviation/logutils.h"
-#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/geo/elevationplane.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/network/voicecapabilities.h"
@@ -93,9 +92,6 @@ namespace BlackCore
         connect(m_fsdClient, &CFSDClient::aircraftConfigReceived,          this, &CAirspaceMonitor::onAircraftConfigReceived);
         connect(m_fsdClient, &CFSDClient::connectionStatusChanged,         this, &CAirspaceMonitor::onConnectionStatusChanged);
 
-        // No longer existing with AFV
-        // connect(m_fsdClient, &CFSDClient::atisVoiceRoomReplyReceived,      this, &CAirspaceMonitor::onAtisVoiceRoomReceived);
-
         // AutoConnection: this should also avoid race conditions by updating the bookings
         Q_ASSERT_X(sApp && sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader");
 

src/blackcore/context/contextapplication.h

@@ -14,7 +14,6 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/context/context.h"
 #include "blackcore/corefacadeconfig.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/compare.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/identifier.h"
@@ -122,9 +121,6 @@ namespace BlackCore
             //! \note Used for hotkey action, do not use directly
             void remoteHotkeyAction(const QString &action, bool argument, const BlackMisc::CIdentifier &origin);
 
-            //! Work around for audio context, #382
-            void fakedSetComVoiceRoom(const BlackMisc::Audio::CVoiceRoomList &requestedRooms);
-
             //! Request a message to be displayed on console, whatever the console is
             //! \note no guarantee it is really written to console
             void requestDisplayOnConsole(const QString &message);

src/blackcore/context/contextnetwork.h

@@ -32,7 +32,6 @@
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/network/userlist.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/identifiable.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/statusmessage.h"
@@ -276,9 +275,6 @@ namespace BlackCore
             //! Load flight plan (from network)
             virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
 
-            //! Use the selected COM1/2 frequencies, and get the corresponding voice room for it
-            virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const = 0;
-
             //! Use the selected COM1/2 frequencies, and get the corresponding ATC stations for it
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const = 0;
 

src/blackcore/context/contextnetworkempty.h

@@ -202,13 +202,6 @@ namespace BlackCore
                 return {};
             }
 
-            //! \copydoc IContextNetwork::getSelectedVoiceRooms()
-            virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override
-            {
-                logEmptyContextWarning(Q_FUNC_INFO);
-                return BlackMisc::Audio::CVoiceRoomList();
-            }
-
             //! \copydoc IContextNetwork::getSelectedAtcStations
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override
             {

src/blackcore/context/contextnetworkimpl.cpp

@@ -1182,19 +1182,6 @@ namespace BlackCore
             return selectedStations;
         }
 
-        CVoiceRoomList CContextNetwork::getSelectedVoiceRooms() const
-        {
-            if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
-            const CAtcStationList stations = this->getSelectedAtcStations();
-            Q_ASSERT(stations.size() == 2);
-            CVoiceRoomList rooms;
-            const CAtcStation s1 = stations[0];
-            const CAtcStation s2 = stations[1];
-            rooms.push_back(s1.getVoiceRoom());
-            rooms.push_back(s2.getVoiceRoom());
-            return rooms;
-        }
-
         QMetaObject::Connection CContextNetwork::connectRawFsdMessageSignal(QObject *receiver, RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot)
         {
             Q_ASSERT_X(receiver, Q_FUNC_INFO, "Missing receiver");

src/blackcore/context/contextnetworkimpl.h

@@ -22,7 +22,6 @@
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/fsd/fsdclient.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/airspaceaircraftsnapshot.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
@@ -261,7 +260,6 @@ namespace BlackCore
             virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
             virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
             BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
-            virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
             virtual BlackMisc::Network::CUserList getUsers() const override;
             virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;

src/blackcore/context/contextnetworkproxy.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "blackcore/context/contextnetworkproxy.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/dbus.h"
 #include "blackmisc/dbusserver.h"
 #include "blackmisc/genericdbusinterface.h"
@@ -203,11 +202,6 @@ namespace BlackCore
             return m_dBusInterface->callDBusRet<bool>(QLatin1String("setOtherClient"), client);
         }
 
-        CVoiceRoomList CContextNetworkProxy::getSelectedVoiceRooms() const
-        {
-            return m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1String("getSelectedVoiceRooms"));
-        }
-
         CAtcStationList CContextNetworkProxy::getSelectedAtcStations() const
         {
             return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getSelectedAtcStations"));

src/blackcore/context/contextnetworkproxy.h

@@ -15,7 +15,6 @@
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/blackcoreexport.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/aviation/airporticaocode.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
@@ -98,7 +97,6 @@ namespace BlackCore
             virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
             virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
             BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
-            virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
             virtual BlackMisc::Network::CUserList getUsers() const override;
             virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;

src/blackcore/context/contextownaircraft.h

@@ -159,14 +159,6 @@ namespace BlackCore
             //! Output volume 0..300
             virtual void setAudioOutputVolume(int outputVolume) = 0;
 
-            //! Set individual voice rooms (overrides voice rooms)
-            //! \note Empty string "" disables voice room override
-            //! \sa enableAutomaticVoiceRoomResolution
-            virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) = 0;
-
-            //! Automatic voice room resolution for frequencies
-            virtual void enableAutomaticVoiceRoomResolution(bool enable) = 0;
-
             //! Default situation
             //! \remark normally used when no driver is attached
             static const BlackMisc::Aviation::CAircraftSituation &getDefaultSituation();

src/blackcore/context/contextownaircraftempty.h

@@ -155,21 +155,6 @@ namespace BlackCore
                 return false;
             }
 
-            //! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
-            virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override
-            {
-                Q_UNUSED(voiceRoom1Url);
-                Q_UNUSED(voiceRoom2Url);
-                logEmptyContextWarning(Q_FUNC_INFO);
-            }
-
-            //! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
-            virtual void enableAutomaticVoiceRoomResolution(bool enable) override
-            {
-                Q_UNUSED(enable);
-                logEmptyContextWarning(Q_FUNC_INFO);
-            }
-
             //! \copydoc IContextOwnAircraft::parseCommandLine
             virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override
             {

src/blackcore/context/contextownaircraftimpl.cpp

@@ -17,8 +17,6 @@
 
 #include "blackcore/application.h"
 #include "blackcore/webdataservices.h"
-#include "blackmisc/audio/voiceroom.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/network/server.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/aircraftsituation.h"
@@ -177,35 +175,6 @@ namespace BlackCore
                 QWriteLocker l(&m_lockAircraft);
                 m_ownAircraft = ownAircraft;
             }
-
-            // voice rooms, if network is already available
-            if (this->getIContextNetwork())
-            {
-                this->resolveVoiceRooms(); // init own aircraft
-            }
-        }
-
-        void CContextOwnAircraft::resolveVoiceRooms()
-        {
-            // If VVL supported is disabled, do nothing
-            if (true) { return; }
-
-            if (!this->getIContextNetwork() || !this->getIContextAudio() || !this->getIContextApplication()) { return; } // no chance to resolve rooms
-            if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
-
-            if (m_voiceRoom1UrlOverride.isEmpty() && m_voiceRoom2UrlOverride.isEmpty() && !m_automaticVoiceRoomResolution) { return; }
-            if (!m_automaticVoiceRoomResolution) { return; } // not responsible
-
-            // requires correct frequencies set
-            // but local network uses exactly this object here, so if frequencies are set here,
-            // they are set for network context as well
-            CVoiceRoomList rooms = this->getIContextNetwork()->getSelectedVoiceRooms();
-
-            if (!m_voiceRoom1UrlOverride.isEmpty()) { rooms[0] = CVoiceRoom(m_voiceRoom1UrlOverride); }
-            if (!m_voiceRoom2UrlOverride.isEmpty()) { rooms[1] = CVoiceRoom(m_voiceRoom2UrlOverride); }
-
-            // set the rooms on the side where the audio is located
-            emit this->getIContextApplication()->fakedSetComVoiceRoom(rooms);
         }
 
         void CContextOwnAircraft::evaluateUpdateHistory()
@@ -341,7 +310,6 @@ namespace BlackCore
             if (changed)
             {
                 emit this->changedAircraftCockpit(m_ownAircraft, originator);
-                this->resolveVoiceRooms(); // cockpit COM changed
             }
             return changed;
         }
@@ -456,14 +424,8 @@ namespace BlackCore
         void CContextOwnAircraft::xCtxChangedAtcStationOnlineConnectionStatus(const CAtcStation &atcStation, bool connected)
         {
             // any of our active frequencies?
-            Q_UNUSED(connected);
+            Q_UNUSED(connected)
-            const CSimulatedAircraft myAircraft(this->getOwnAircraft());
+            Q_UNUSED(atcStation)
-
-            // relevant frequency
-            if (myAircraft.getCom1System().isActiveFrequencyWithinChannelSpacing(atcStation.getFrequency()) || myAircraft.getCom2System().isActiveFrequencyWithinChannelSpacing(atcStation.getFrequency()))
-            {
-                this->resolveVoiceRooms(); // online status changed
-            }
         }
 
         void CContextOwnAircraft::xCtxChangedSimulatorModel(const CAircraftModel &model, const CIdentifier &identifier)
@@ -505,23 +467,9 @@ namespace BlackCore
             // from the driver
         }
 
-        void CContextOwnAircraft::setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url)
-        {
-            if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << voiceRoom1Url << voiceRoom2Url; }
-            m_voiceRoom1UrlOverride = voiceRoom1Url.trimmed();
-            m_voiceRoom2UrlOverride = voiceRoom2Url.trimmed();
-            this->resolveVoiceRooms(); // override
-        }
-
-        void CContextOwnAircraft::enableAutomaticVoiceRoomResolution(bool enable)
-        {
-            if (m_debugEnabled) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << enable; }
-            m_automaticVoiceRoomResolution = enable;
-        }
-
         bool CContextOwnAircraft::parseCommandLine(const QString &commandLine, const CIdentifier &originator)
         {
-            Q_UNUSED(originator);
+            Q_UNUSED(originator)
             if (commandLine.isEmpty()) { return false; }
             CSimpleCommandParser parser(
             {

src/blackcore/context/contextownaircraftimpl.h

@@ -179,12 +179,6 @@ namespace BlackCore
             //! \copydoc IContextOwnAircraft::setAudioOutputVolume
             virtual void setAudioOutputVolume(int outputVolume) override;
 
-            //! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
-            virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override;
-
-            //! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
-            virtual void enableAutomaticVoiceRoomResolution(bool enable) override;
-
             //! \addtogroup swiftdotcommands
             //! @{
             //! <pre>
@@ -218,9 +212,6 @@ namespace BlackCore
 
         private:
             BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft; //!< my aircraft
-            bool m_automaticVoiceRoomResolution = true;  //!< automatic voice room resolution, or disable for override
-            QString m_voiceRoom1UrlOverride;             //!< overridden voice room url
-            QString m_voiceRoom2UrlOverride;             //!< overridden voice room url
             mutable QReadWriteLock m_lockAircraft;       //!< lock aircraft
 
             CActionBind m_actionToggleXpdr { BlackMisc::Input::toggleXPDRStateHotkeyAction(), BlackMisc::Input::toggleXPDRStateHotkeyIcon(), this, &CContextOwnAircraft::actionToggleTransponder };
@@ -257,9 +248,6 @@ namespace BlackCore
             //! Init my very own aircraft with some defaults, before overridden by simulator
             void initOwnAircraft();
 
-            //! Resolve voice rooms
-            void resolveVoiceRooms();
-
             //! Update position history
             void evaluateUpdateHistory();
 

src/blackcore/context/contextownaircraftproxy.cpp

@@ -137,16 +137,6 @@ namespace BlackCore
             m_dBusInterface->callDBus(QLatin1String("setAudioOutputVolume"), outputVolume);
         }
 
-        void CContextOwnAircraftProxy::setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url)
-        {
-            m_dBusInterface->callDBus(QLatin1String("setAudioVoiceRoomOverrideUrls"), voiceRoom1Url, voiceRoom2Url);
-        }
-
-        void CContextOwnAircraftProxy::enableAutomaticVoiceRoomResolution(bool enable)
-        {
-            m_dBusInterface->callDBus(QLatin1String("enableAutomaticVoiceRoomResolution"), enable);
-        }
-
         void CContextOwnAircraftProxy::toggleTransponderMode()
         {
             m_dBusInterface->callDBus(QLatin1String("toggleTransponderMode"));

src/blackcore/context/contextownaircraftproxy.h

@@ -77,8 +77,6 @@ namespace BlackCore
             virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
             virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) override;
             virtual void setAudioOutputVolume(int outputVolume) override;
-            virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override;
-            virtual void enableAutomaticVoiceRoomResolution(bool enable) override;
             virtual void toggleTransponderMode() override;
             virtual bool setTransponderMode(BlackMisc::Aviation::CTransponder::TransponderMode mode) override;
             virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;

src/blackgui/components/cockpitcomcomponent.cpp

@@ -17,10 +17,8 @@
 #include "blackgui/guiapplication.h"
 #include "blackgui/led.h"
 #include "blackgui/stylesheetutility.h"
-#include "blackmisc/audio/voiceroom.h"
-#include "blackmisc/audio/voiceroomlist.h"
-#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/logmessage.h"
@@ -167,13 +165,6 @@ namespace BlackGui
             return sGui->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), ownAircraft.getTransponder(), identifier());
         }
 
-        void CCockpitComComponent::updateVoiceRoomStatusFromContext(const CVoiceRoomList &selectedVoiceRooms, bool connected)
-        {
-            Q_ASSERT(selectedVoiceRooms.size() == 2);
-            Q_UNUSED(connected);
-            ui->editor_Com->setVoiceRoomStatus(selectedVoiceRooms);
-        }
-
         void CCockpitComComponent::forceCockpitUpdateFromOwnAircraftContext()
         {
             if (!sGui || sGui->isShuttingDown()) { return; }

src/blackgui/components/cockpitcomcomponent.h

@@ -14,7 +14,6 @@
 #include "blackgui/enablefordockwidgetinfoarea.h"
 #include "blackgui/blackguiexport.h"
 
-#include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/aviation/selcal.h"
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/identifiable.h"
@@ -86,9 +85,6 @@ namespace BlackGui
             //! Update cockpit from context
             void updateCockpitFromContext(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator);
 
-            //! Update voice room related information
-            void updateVoiceRoomStatusFromContext(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected);
-
             //! Update the cockpit from aircraft context
             void forceCockpitUpdateFromOwnAircraftContext();
 

src/blackgui/components/transpondermodecomponent.cpp

@@ -30,6 +30,9 @@ namespace BlackGui
         {
             ui->setupUi(this);
 
+            Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sApp");
+            Q_ASSERT_X(sGui->getIContextOwnAircraft(), Q_FUNC_INFO, "Need own aircraft");
+
             connect(ui->tb_TransponderMode, &QToolButton::released, this, &CTransponderModeComponent::onClicked, Qt::QueuedConnection);
             connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CTransponderModeComponent::onChangedAircraftCockpit, Qt::QueuedConnection);
 

src/blackgui/editors/cockpitcomform.cpp

@@ -91,15 +91,6 @@ namespace BlackGui
             return msgs;
         }
 
-        void CCockpitComForm::setVoiceRoomStatus(const CVoiceRoomList &selectedVoiceRooms)
-        {
-            Q_ASSERT_X(selectedVoiceRooms.size() == 2, Q_FUNC_INFO, "Expect 2 voice rooms");
-            const CVoiceRoom room1 = selectedVoiceRooms[0];
-            const CVoiceRoom room2 = selectedVoiceRooms[1];
-            ui->led_ComPanelCom1->setOn(room1.isConnected());
-            ui->led_ComPanelCom2->setOn(room2.isConnected());
-        }
-
         void CCockpitComForm::setSelectedAtcStations(const CAtcStationList &selectedStations)
         {
             const CAtcStation com1Ttation = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation();

src/blackgui/editors/cockpitcomform.h

@@ -15,7 +15,6 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/audio/voiceroomlist.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -44,9 +43,6 @@ namespace BlackGui
             //! Set the XPDR values
             void setTransponder(const BlackMisc::Aviation::CTransponder &transponder);
 
-            //! Change the voice room status
-            void setVoiceRoomStatus(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms);
-
             //! Set selected stations
             void setSelectedAtcStations(const BlackMisc::Aviation::CAtcStationList &selectedStations);
 

src/blackgui/models/atcstationlistmodel.cpp

@@ -10,7 +10,6 @@
 #include "blackgui/models/atcstationtreemodel.h"
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
-#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/compare.h"
 #include "blackmisc/icon.h"
@@ -51,7 +50,6 @@ namespace BlackGui
             (void)QT_TRANSLATE_NOOP("ModelAtcList", "online");
             (void)QT_TRANSLATE_NOOP("ModelAtcList", "bookedfrom");
             (void)QT_TRANSLATE_NOOP("ModelAtcList", "bookeduntil");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "voiceroomurl");
         }
 
         void CAtcStationListModel::setStationMode(CAtcStationListModel::AtcStationMode stationMode)
@@ -76,7 +74,6 @@ namespace BlackGui
                     m_columns.addColumnIncognito(CColumn::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName }));
                     m_columns.addColumn(CColumn("from", "booked from", CAtcStation::IndexBookedFrom, new CDateTimeFormatter(CDateTimeFormatter::formatHm())));
                     m_columns.addColumn(CColumn("until", "booked until", CAtcStation::IndexBookedUntil, new CDateTimeFormatter(CDateTimeFormatter::formatHm())));
-                    m_columns.addColumn(CColumn::standardString("voiceroomurl", { CAtcStation::IndexVoiceRoom, CVoiceRoom::IndexUrl }));
 
                     // default sort order
                     this->setSortColumnByPropertyIndex(CAtcStation::IndexRelativeDistance);