1 files changed, 0 insertions, 164 deletions
diff --git a/server/osc_server.c b/server/osc_server.c
deleted file mode 100644
index 223a192..0000000
--- a/server/osc_server.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  dolmetschctl
- *
- *
- *  Copyright (C) 2015 Christian Pointner <equinox@spreadspace.org>
- *
- *  This file is part of dolmetschctl.
- *
- *  dolmetschctl is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  any later version.
- *
- *  dolmetschctl is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with dolmetschctl. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <error.h>
-#include <assert.h>
-
-#include "osc_server.h"
-
-
-static void print_error(int num, const char *msg, const char *path)
-{
-  error(0, 0, "liblo server error %d in path %s: %s", num, path, msg);
-}
-
-static int lang_handler(const char *path, const char *types, lo_arg ** argv,
-                    int argc, lo_message msg, void *user_data)
-{
-  if(argc != 1 || !lo_is_string_type((lo_type)types[0]))
-    return 1;
-
-  lo_address from = lo_message_get_source(msg);
-  const char* host = lo_address_get_hostname(from);
-  const char* port = lo_address_get_port(from);
-  assert(host && port);
-
-  osc_t* o = (osc_t*)user_data;
-  assert(o);
-  osc_done_data_t* done_data = malloc(sizeof(osc_done_data_t));
-  assert(done_data);
-
-  done_data->self_ = o;
-  done_data->state_ = 0;
-  assert((done_data->lang_ = strdup(&(argv[0]->s))));
-  done_data->addr_ = lo_address_new(host, port);
-  assert(done_data->addr_);
-  done_data->msg_ = lo_message_new();
-  assert(done_data->msg_);
-  assert(!lo_message_add(done_data->msg_, "s", done_data->lang_));
-
-  assert(slist_add(&(o->done_data_), done_data));
-
-  return 0;
-}
-
-void free_osc_done_data(void* ptr)
-{
-  osc_done_data_t* done_data = (osc_done_data_t*)ptr;
-
-  lo_message_free(done_data->msg_);
-  lo_address_free(done_data->addr_);
-  free(done_data->lang_);
-  free(done_data);
-}
-
-void osc_lang_switch_done(void* data)
-{
-  assert(data);
-  osc_done_data_t* d = data;
-
-  lo_send_message_from(d->addr_, d->self_->server_, "/lang/ack", d->msg_);
-  slist_remove(&(d->self_->done_data_), d);
-}
-
-int osc_init(osc_t* o, const char* port)
-{
-  assert(o != NULL);
-
-  o->server_ = NULL;
-  slist_init(&(o->done_data_), free_osc_done_data);
-
-  if(!port)
-    return 0;
-
-  o->server_ = lo_server_new(port, print_error);
-  if(!o->server_)
-    return -1;
-
-  if(!lo_server_add_method(o->server_, "/lang/switch", "s", lang_handler, (void*)o))
-    return -1;
-
-  return 0;
-}
-
-
-int osc_get_poll_fd_count(osc_t* o)
-{
-  assert(o);
-
-  if(!o->server_)
-    return 0;
-
-  return 1;
-}
-
-int osc_get_poll_fds(osc_t* o, struct pollfd *pfds, int npfds)
-{
-  assert(o);
-
-  if(!o->server_)
-    return 0;
-
-  pfds[0].fd = lo_server_get_socket_fd(o->server_);
-  pfds[0].events = POLLIN;
-  pfds[0].revents = 0;
-
-  return 0;
-}
-
-int osc_handle_revents(osc_t* o, struct pollfd *pfds, int npfds, mixer_t* x)
-{
-  assert(o);
-
-  if(!o->server_)
-    return 0;
-
-  if(pfds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) {
-    error(0, 0, "OSC: got POLLERR, POLLHUP or POLLNVAL");
-    return -1;
-  }
-  if(!(pfds[0].revents & POLLIN))
-    return 0;
-
-  lo_server_recv_noblock(o->server_, 0);
-
-  int ret = 0;
-  slist_element_t* tmp;
-  for(tmp = o->done_data_.first_; tmp; tmp = tmp->next_) {
-    osc_done_data_t* d = (osc_done_data_t*)(tmp->data_);
-    if(d->state_ == 0) {
-      ret = mixer_switch_lang(x, d->lang_, &osc_lang_switch_done, d);
-      if(ret)
-        break;
-
-      d->state_ = 1;
-    }
-  }
-
-
-  return ret;
-}