merge back everything

mazda/callbacks.cpp

@@ -17,7 +17,7 @@ MazdaEventCallbacks::MazdaEventCallbacks(DBus::Connection& serviceBus, DBus::Con
     , audioFocus(AudioManagerClient::FocusType::NONE)
 {
     //no need to create/destroy this
-    audioOutput.reset(new AudioOutput("entertainmentUsb"));
+    audioOutput.reset(new AudioOutput("entertainmentMl"));
     audioMgrClient.reset(new AudioManagerClient(*this, serviceBus));
     videoMgrClient.reset(new VideoManagerClient(*this, hmiBus));
 }
@@ -376,6 +376,14 @@ void AudioManagerClient::populateStreamTable()
             {
                 aaSessionID = sessionId;
             }
+            else if(streamName == "USB")
+            {
+                usbSessionID = sessionId;
+            }
+            else if(streamName == "FM")
+            {
+                fmSessionID = sessionId;
+            }
         }
         // Create and register stream (only if we need to)
         if (aaSessionID < 0)

mazda/callbacks.h

@@ -70,8 +70,10 @@ class AudioManagerClient : public com::xsembedded::ServiceProvider_proxy,
     };
 private:
     std::map<std::string, int> streamToSessionIds;
-    std::string aaStreamName = "USB";
+    std::string aaStreamName = "MLENT";
     int aaSessionID = -1;
+    int usbSessionID = -1;
+    int fmSessionID = -1;
     int previousSessionID = -1;
     bool aaStreamRegistered = false;
     bool waitingForFocusLostEvent = false;

mazda/main.cpp

@@ -178,7 +178,7 @@ int main (int argc, char *argv[])
             /* Start gstreamer pipeline and main loop */
 
             // GPS processing
-            //mzd_gps_start(&gps_location_handler);
+            mzd_gps_start(&gps_location_handler);
 
             printf("Starting Android Auto...\n");
 
@@ -198,7 +198,7 @@ int main (int argc, char *argv[])
             nm_thread.join();
 
             printf("waiting for gps_thread\n");
-            //mzd_gps_stop();
+            mzd_gps_stop();
 
             printf("shutting down\n");