| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h" | 5 #include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "chrome/browser/chromeos/system/runtime_environment.h" | 9 #include "chrome/browser/chromeos/system/runtime_environment.h" |
| 10 #include "dbus/bus.h" | 10 #include "dbus/bus.h" |
| 11 #include "dbus/message.h" | 11 #include "dbus/message.h" |
| 12 #include "dbus/object_path.h" |
| 12 #include "dbus/object_proxy.h" | 13 #include "dbus/object_proxy.h" |
| 13 #include "third_party/cros_system_api/dbus/service_constants.h" | 14 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 14 | 15 |
| 15 namespace chromeos { | 16 namespace chromeos { |
| 16 | 17 |
| 17 // TODO(chaitanyag): rename to "locale" after making equivalent change in | 18 // TODO(chaitanyag): rename to "locale" after making equivalent change in |
| 18 // Chrome OS code. | 19 // Chrome OS code. |
| 19 const char SpeechSynthesizerClient::kSpeechPropertyLocale[] = "name"; | 20 const char SpeechSynthesizerClient::kSpeechPropertyLocale[] = "name"; |
| 20 | 21 |
| 21 const char SpeechSynthesizerClient::kSpeechPropertyGender[] = "gender"; | 22 const char SpeechSynthesizerClient::kSpeechPropertyGender[] = "gender"; |
| 22 const char SpeechSynthesizerClient::kSpeechPropertyRate[] = "rate"; | 23 const char SpeechSynthesizerClient::kSpeechPropertyRate[] = "rate"; |
| 23 const char SpeechSynthesizerClient::kSpeechPropertyPitch[] = "pitch"; | 24 const char SpeechSynthesizerClient::kSpeechPropertyPitch[] = "pitch"; |
| 24 const char SpeechSynthesizerClient::kSpeechPropertyVolume[] = "volume"; | 25 const char SpeechSynthesizerClient::kSpeechPropertyVolume[] = "volume"; |
| 25 const char SpeechSynthesizerClient::kSpeechPropertyEquals[] = "="; | 26 const char SpeechSynthesizerClient::kSpeechPropertyEquals[] = "="; |
| 26 const char SpeechSynthesizerClient::kSpeechPropertyDelimiter[] = ";"; | 27 const char SpeechSynthesizerClient::kSpeechPropertyDelimiter[] = ";"; |
| 27 | 28 |
| 28 class SpeechSynthesizerClientImpl : public SpeechSynthesizerClient { | 29 class SpeechSynthesizerClientImpl : public SpeechSynthesizerClient { |
| 29 public: | 30 public: |
| 30 explicit SpeechSynthesizerClientImpl(dbus::Bus* bus) | 31 explicit SpeechSynthesizerClientImpl(dbus::Bus* bus) |
| 31 : proxy_(NULL), | 32 : proxy_(NULL), |
| 32 weak_ptr_factory_(this) { | 33 weak_ptr_factory_(this) { |
| 33 proxy_ = bus->GetObjectProxy( | 34 proxy_ = bus->GetObjectProxy( |
| 34 speech_synthesis::kSpeechSynthesizerServiceName, | 35 speech_synthesis::kSpeechSynthesizerServiceName, |
| 35 speech_synthesis::kSpeechSynthesizerServicePath); | 36 dbus::ObjectPath(speech_synthesis::kSpeechSynthesizerServicePath)); |
| 36 } | 37 } |
| 37 virtual ~SpeechSynthesizerClientImpl() {} | 38 virtual ~SpeechSynthesizerClientImpl() {} |
| 38 | 39 |
| 39 virtual void Speak(const std::string& text, | 40 virtual void Speak(const std::string& text, |
| 40 const std::string& properties) OVERRIDE { | 41 const std::string& properties) OVERRIDE { |
| 41 dbus::MethodCall method_call(speech_synthesis::kSpeechSynthesizerInterface, | 42 dbus::MethodCall method_call(speech_synthesis::kSpeechSynthesizerInterface, |
| 42 speech_synthesis::kSpeak); | 43 speech_synthesis::kSpeak); |
| 43 dbus::MessageWriter writer(&method_call); | 44 dbus::MessageWriter writer(&method_call); |
| 44 writer.AppendString(text); | 45 writer.AppendString(text); |
| 45 writer.AppendString(properties); | 46 writer.AppendString(properties); |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 // static | 127 // static |
| 127 SpeechSynthesizerClient* SpeechSynthesizerClient::Create(dbus::Bus* bus) { | 128 SpeechSynthesizerClient* SpeechSynthesizerClient::Create(dbus::Bus* bus) { |
| 128 if (system::runtime_environment::IsRunningOnChromeOS()) { | 129 if (system::runtime_environment::IsRunningOnChromeOS()) { |
| 129 return new SpeechSynthesizerClientImpl(bus); | 130 return new SpeechSynthesizerClientImpl(bus); |
| 130 } else { | 131 } else { |
| 131 return new SpeechSynthesizerClientStubImpl(); | 132 return new SpeechSynthesizerClientStubImpl(); |
| 132 } | 133 } |
| 133 } | 134 } |
| 134 | 135 |
| 135 } // namespace chromeos | 136 } // namespace chromeos |
| OLD | NEW |