Merge branch 'master' of github.com:horihiro/esp8266-google-home-notifier

Author: horihiro

src/esp8266-google-home-notifier.cpp

@@ -57,15 +57,38 @@ boolean GoogleHomeNotifier::device(const char * name, const char * locale, int t
   return true;
 }
 
-boolean GoogleHomeNotifier::notify(const char * phrase)
+boolean GoogleHomeNotifier::ip(IPAddress ip, const char *locale)
+{
+  this->m_ipaddress = ip;
+  this->m_port = 8009;
+  sprintf(this->m_locale, "%s", locale);
+  return true;
+}
+
+boolean GoogleHomeNotifier::notify(const char * phrase) {
+  return this->cast(phrase, NULL);
+}
+
+boolean GoogleHomeNotifier::play(const char * mp3Url) {
+  return this->cast(NULL, mp3Url);
+}
+
+boolean GoogleHomeNotifier::cast(const char * phrase, const char * mp3Url)
 {
   char error[128];
   String speechUrl;
-  speechUrl = tts.getSpeechUrl(phrase, m_locale);
-  delay(1);
+  if (phrase != NULL) {
+    speechUrl = tts.getSpeechUrl(phrase, m_locale);
+    delay(1);
 
-  if (speechUrl.indexOf("https://") != 0) {
-    this->setLastError("Failed to get TTS url.");
+    if (speechUrl.indexOf("https://") != 0) {
+      this->setLastError("Failed to get TTS url.");
+      return false;
+    }
+  } else if (mp3Url != NULL) {
+    speechUrl = mp3Url;
+  } else {
+    this->setLastError("Both TTS phrase and mp3 url are NULL.");
     return false;
   }
 
@@ -87,7 +110,7 @@ boolean GoogleHomeNotifier::notify(const char * phrase)
   }
 
   delay(1);
-  if( this->play(speechUrl.c_str()) != true) {
+  if( this->_play(speechUrl.c_str()) != true) {
     sprintf(error, "Failed to play mp3 file. (%s)", this->getLastError());
     this->setLastError(error);
     disconnect();
@@ -244,7 +267,7 @@ boolean GoogleHomeNotifier::connect()
   return true;
 }
 
-boolean GoogleHomeNotifier::play(const char * mp3url)
+boolean GoogleHomeNotifier::_play(const char * mp3url)
 {
   // send 'CONNECT' again
   sprintf(data, CASTV2_DATA_CONNECT);

src/esp8266-google-home-notifier.h

@@ -52,16 +52,19 @@ typedef class GoogleHomeNotifier {
   static bool encode_string(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
   static bool decode_string(pb_istream_t *stream, const pb_field_t *field, void **arg);
   boolean connect();
-  boolean play(const char* mp3url);
+  boolean _play(const char* mp3url);
   void disconnect();
   void setLastError(const char* lastError);
   boolean sendMessage(const char* sourceId, const char* destinationId, const char* ns, const char* data);
+  boolean cast(const char * phrase, const char * mp3Url);
 
 public:
   boolean device(const char * name); // locale = 'en', timeout = 10000
   boolean device(const char * name, const char * locale); // timeout = 10000
   boolean device(const char * name, const char * locale, int timeout);
+  boolean ip(IPAddress ip, const char *locale);
   boolean notify(const char * phrase);
+  boolean play(const char * mp3Url);
   const IPAddress getIPAddress();
   const uint16_t getPort();
   const char * getLastError();