diff --git a/src/apps/marble-maps/NavigationManager.qml b/src/apps/marble-maps/NavigationManager.qml --- a/src/apps/marble-maps/NavigationManager.qml +++ b/src/apps/marble-maps/NavigationManager.qml @@ -93,27 +93,13 @@ Navigation { id: navigation marbleQuickItem: marbleItem - soundEnabled: false onVoiceNavigationAnnouncementChanged: { if (!parent.visible) { return ""; } - switch (voiceNavigationAnnouncement) { - case "ListEnd": - audioPlayer.source = "assets:/data/audio/KDE-Sys-List-End.ogg"; - audioPlayer.stop(); - audioPlayer.play(); - break; - case "AppPositive": - audioPlayer.source = "assets:/data/audio/KDE-Sys-App-Positive.ogg"; - audioPlayer.stop(); - audioPlayer.play(); - break; - default: - textToSpeechClient.readText(voiceNavigationAnnouncement); - } + textToSpeechClient.readText(voiceNavigationAnnouncement); } } } diff --git a/src/lib/marble/declarative/Navigation.h b/src/lib/marble/declarative/Navigation.h --- a/src/lib/marble/declarative/Navigation.h +++ b/src/lib/marble/declarative/Navigation.h @@ -28,7 +28,6 @@ Q_PROPERTY(Marble::MarbleQuickItem * marbleQuickItem READ marbleQuickItem WRITE setMarbleQuickItem NOTIFY marbleQuickItemChanged) Q_PROPERTY(bool guidanceModeEnabled READ guidanceModeEnabled WRITE setGuidanceModeEnabled NOTIFY guidanceModeEnabledChanged) Q_PROPERTY(bool muted READ muted WRITE setMuted NOTIFY mutedChanged) - Q_PROPERTY(bool soundEnabled READ soundEnabled WRITE setSoundEnabled NOTIFY soundEnabledChanged) Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker NOTIFY speakerChanged) Q_PROPERTY(QString nextInstructionText READ nextInstructionText NOTIFY nextInstructionTextChanged) Q_PROPERTY(QString nextRoad READ nextRoad NOTIFY nextRoadChanged) @@ -69,10 +68,6 @@ void setSpeaker( const QString &speaker ); - bool soundEnabled() const; - - void setSoundEnabled( bool soundEnabled ); - bool deviated() const; Marble::MarbleQuickItem * marbleQuickItem() const; diff --git a/src/lib/marble/declarative/Navigation.cpp b/src/lib/marble/declarative/Navigation.cpp --- a/src/lib/marble/declarative/Navigation.cpp +++ b/src/lib/marble/declarative/Navigation.cpp @@ -214,16 +214,6 @@ d->m_voiceNavigation.setSpeaker( speaker ); } -bool Navigation::soundEnabled() const -{ - return !d->m_voiceNavigation.isSpeakerEnabled(); -} - -void Navigation::setSoundEnabled( bool soundEnabled ) -{ - d->m_voiceNavigation.setSpeakerEnabled( !soundEnabled ); -} - bool Navigation::deviated() const { if ( d->m_marbleQuickItem ) { diff --git a/src/lib/marble/routing/VoiceNavigationModel.h b/src/lib/marble/routing/VoiceNavigationModel.h --- a/src/lib/marble/routing/VoiceNavigationModel.h +++ b/src/lib/marble/routing/VoiceNavigationModel.h @@ -29,7 +29,6 @@ Q_OBJECT Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker NOTIFY speakerChanged) - Q_PROPERTY(bool isSpeakerEnabled READ isSpeakerEnabled WRITE setSpeakerEnabled NOTIFY isSpeakerEnabledChanged ) Q_PROPERTY(QString instruction READ instruction NOTIFY instructionChanged) Q_PROPERTY(QString preview READ preview NOTIFY previewChanged) @@ -45,10 +44,6 @@ void setSpeaker( const QString &speaker ); - bool isSpeakerEnabled() const; - - void setSpeakerEnabled( bool enabled ); - void reset(); public Q_SLOTS: diff --git a/src/lib/marble/routing/VoiceNavigationModel.cpp b/src/lib/marble/routing/VoiceNavigationModel.cpp --- a/src/lib/marble/routing/VoiceNavigationModel.cpp +++ b/src/lib/marble/routing/VoiceNavigationModel.cpp @@ -23,8 +23,6 @@ QString m_speaker; - bool m_speakerEnabled; - PositionProviderStatus m_gpsStatus; QMap m_turnTypeMap; @@ -69,7 +67,6 @@ VoiceNavigationModelPrivate::VoiceNavigationModelPrivate( VoiceNavigationModel* parent ) : m_parent( parent ), - m_speakerEnabled( true ), m_gpsStatus( PositionProviderStatusUnavailable ), m_lastDistance( 0.0 ), m_lastTurnType( Maneuver::Unknown ), @@ -90,20 +87,18 @@ return name; #else QStringList const formats = QStringList() << "ogg" << "mp3" << "wav"; - if ( m_speakerEnabled ) { - QString const audioTemplate = "%1/%2.%3"; - foreach( const QString &format, formats ) { - QString const result = audioTemplate.arg( m_speaker ).arg( name ).arg( format ); - QFileInfo audioFile( result ); - if ( audioFile.exists() ) { - return result; - } + QString const audioTemplate1 = "%1/%2.%3"; + foreach( const QString &format, formats ) { + QString const result = audioTemplate1.arg( m_speaker ).arg( name ).arg( format ); + QFileInfo audioFile( result ); + if ( audioFile.exists() ) { + return result; } } - QString const audioTemplate = "audio/%1.%2"; + QString const audioTemplate2 = "audio/%1.%2"; foreach( const QString &format, formats ) { - QString const result = MarbleDirs::path( audioTemplate.arg( name ).arg( format ) ); + QString const result = MarbleDirs::path( audioTemplate2.arg( name ).arg( format ) ); if ( !result.isEmpty() ) { return result; } @@ -141,7 +136,7 @@ { bool const announce = distance >= 75; QMap const & map = announce ? m_announceMap : m_turnTypeMap; - if ( m_speakerEnabled && map.contains( turnType ) ) { + if ( map.contains( turnType ) ) { return audioFile( map[turnType] ); } @@ -301,20 +296,6 @@ } } -bool VoiceNavigationModel::isSpeakerEnabled() const -{ - return d->m_speakerEnabled; -} - -void VoiceNavigationModel::setSpeakerEnabled( bool enabled ) -{ - if ( enabled != d->m_speakerEnabled ) { - d->m_speakerEnabled = enabled; - emit isSpeakerEnabledChanged(); - emit previewChanged(); - } -} - void VoiceNavigationModel::reset() { d->reset(); @@ -323,11 +304,11 @@ void VoiceNavigationModel::handleTrackingStatusChange( PositionProviderStatus status ) { if ( status != PositionProviderStatusAvailable && d->m_gpsStatus == PositionProviderStatusAvailable ) { - d->updateInstruction( d->m_speakerEnabled ? "Lost GPS Connection" : "ListEnd" ); + d->updateInstruction( "Lost GPS Connection" ); } if ( status == PositionProviderStatusAvailable && d->m_gpsStatus != PositionProviderStatusAvailable ) { - d->updateInstruction( d->m_speakerEnabled ? "GPS Position Found" : "AppPositive" ); + d->updateInstruction( "GPS Position Found" ); } d->m_gpsStatus = status; @@ -341,7 +322,7 @@ if ( !d->m_destinationReached && distanceTarget < 50 ) { d->m_destinationReached = true; - d->updateInstruction( d->m_speakerEnabled ? "You have arrived at your destination" : "AppPositive" ); + d->updateInstruction( "You have arrived at your destination" ); return; } @@ -350,7 +331,7 @@ } if ( deviated && !d->m_deviated ) { - d->updateInstruction( d->m_speakerEnabled ? "Deviated from the route" : "ListEnd" ); + d->updateInstruction( "Deviated from the route" ); } d->m_deviated = deviated; if ( deviated ) { @@ -375,7 +356,7 @@ QString VoiceNavigationModel::preview() const { - return d->audioFile( d->m_speakerEnabled ? "The Marble team wishes you a pleasant and safe journey!" : "AppPositive" ); + return d->audioFile( "The Marble team wishes you a pleasant and safe journey!" ); } QString VoiceNavigationModel::instruction() const