From fa4f1a323aa5bcc46b366d6c4afc634885f64f43 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 19 Jun 2015 22:15:03 -0400
Subject: [PATCH] Switch to API 1.1 for moonlight-common-c

---
 src/audio.c      |  6 ++----
 src/main.c       | 14 +-------------
 src/video/fake.c |  6 ++----
 src/video/imx.c  |  6 ++----
 src/video/omx.c  |  8 ++------
 5 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/audio.c b/src/audio.c
index 0888399..eaddf26 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -71,7 +71,7 @@ static void audio_renderer_init() {
   CHECK_RETURN(snd_pcm_prepare(handle));
 }
 
-static void audio_renderer_release() {
+static void audio_renderer_cleanup() {
   if (decoder != NULL)
     opus_decoder_destroy(decoder);
 
@@ -99,8 +99,6 @@ static void audio_renderer_decode_and_play_sample(char* data, int length) {
 
 AUDIO_RENDERER_CALLBACKS audio_callbacks = {
   .init = audio_renderer_init,
-  .start = NULL,
-  .stop = NULL,
-  .release = audio_renderer_release,
+  .cleanup = audio_renderer_cleanup,
   .decodeAndPlaySample = audio_renderer_decode_and_play_sample,
 };
diff --git a/src/main.c b/src/main.c
index a2f02e0..1c2a6d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,19 +61,7 @@ static void stream(STREAM_CONFIGURATION* config, const char* address, const char
 
   video_init();
 
-  struct addrinfo hints, *res;
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_INET;
-  hints.ai_socktype = SOCK_STREAM;
-  int err = getaddrinfo(address, NULL, &hints, &res);
-  if (err<0 || res == NULL) {
-    fprintf(stderr, "Can't resolve host: %s\n", address);
-    exit(-1);
-  }
-
-  struct sockaddr_in *addr = (struct sockaddr_in*)res->ai_addr;
-  LiStartConnection(addr->sin_addr.s_addr, config, &connection_callbacks, decoder_callbacks, &audio_callbacks, NULL, NULL, 0, client_get_server_version());
-  freeaddrinfo(res);
+  LiStartConnection(address, config, &connection_callbacks, decoder_callbacks, &audio_callbacks, NULL, NULL, 0, client_get_server_version());
 
   input_loop();
 
diff --git a/src/video/fake.c b/src/video/fake.c
index dc772ed..39ae63f 100644
--- a/src/video/fake.c
+++ b/src/video/fake.c
@@ -28,7 +28,7 @@ void decoder_renderer_setup(int width, int height, int redrawRate, void* context
   fd = fopen(fileName, "w");
 }
 
-void decoder_renderer_release() {
+void decoder_renderer_cleanup() {
   fclose(fd);
 }
 
@@ -43,8 +43,6 @@ int decoder_renderer_submit_decode_unit(PDECODE_UNIT decodeUnit) {
 
 DECODER_RENDERER_CALLBACKS decoder_callbacks_fake = {
   .setup = decoder_renderer_setup,
-  .start = NULL,
-  .stop = NULL,
-  .release = decoder_renderer_release,
+  .cleanup = decoder_renderer_cleanup,
   .submitDecodeUnit = decoder_renderer_submit_decode_unit,
 };
diff --git a/src/video/imx.c b/src/video/imx.c
index 987c017..59992c5 100644
--- a/src/video/imx.c
+++ b/src/video/imx.c
@@ -412,7 +412,7 @@ static int decoder_renderer_submit_decode_unit(PDECODE_UNIT decodeUnit) {
   return DR_OK;
 }
 
-static void decoder_renderer_release() {
+static void decoder_renderer_cleanup() {
   IOFreePhyMem(&ps_mem_desc);
   IOFreePhyMem(&slice_mem_desc);
   
@@ -423,8 +423,6 @@ static void decoder_renderer_release() {
 
 DECODER_RENDERER_CALLBACKS decoder_callbacks_imx = {
   .setup = decoder_renderer_setup,
-  .start = NULL,
-  .stop = NULL,
-  .release = decoder_renderer_release,
+  .cleanup = decoder_renderer_cleanup,
   .submitDecodeUnit = decoder_renderer_submit_decode_unit,
 };
diff --git a/src/video/omx.c b/src/video/omx.c
index 9aa4a1c..2e32e52 100644
--- a/src/video/omx.c
+++ b/src/video/omx.c
@@ -130,7 +130,7 @@ static void decoder_renderer_setup(int width, int height, int redrawRate, void*
   }
 }
 
-static void decoder_renderer_stop() {
+static void decoder_renderer_cleanup() {
   int status = 0;
 
   buf->nFilledLen = 0;
@@ -145,9 +145,7 @@ static void decoder_renderer_stop() {
   ilclient_flush_tunnels(tunnel, 0);
 
   ilclient_disable_port_buffers(list[0], 130, NULL, NULL, NULL);
-}
 
-static void decoder_renderer_release() {
   ilclient_disable_tunnel(tunnel);
   ilclient_teardown_tunnels(tunnel);
 
@@ -228,8 +226,6 @@ static int decoder_renderer_submit_decode_unit(PDECODE_UNIT decodeUnit) {
 
 DECODER_RENDERER_CALLBACKS decoder_callbacks_omx = {
   .setup = decoder_renderer_setup,
-  .start = NULL,
-  .stop = decoder_renderer_stop,
-  .release = decoder_renderer_release,
+  .cleanup = decoder_renderer_cleanup,
   .submitDecodeUnit = decoder_renderer_submit_decode_unit,
 };