Changeset 1106:b71671032077 in roaraudio for plugins/xmms

Timestamp:

01/11/09 05:45:50 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added all.h and gui.c, added mor config vars, read parts of the config foem XMMS configfile

Location:

plugins/xmms

Files:

• Makefile (modified) (1 diff)
• all.h (added)
• gui.c (added)
• roar.c (modified) (3 diffs)

plugins/xmms/Makefile

@@ -1 +1 @@
 TARGET=libroar.so
 
-OBJ=roar.o
+OBJ=roar.o gui.o
 
 include Makefile.conf

plugins/xmms/roar.c

@@ -87 +87 @@
 
 struct xmms_roar_out {
- int state;
- char * server;
+ int                 state;
+ char              * server;
  struct roar_connection con;
  struct roar_stream     stream;
- int data_fh;
- long unsigned int written;
- long unsigned int bps;
- int session;
- int pause;
+ int                 data_fh;
+ long unsigned int   written;
+ long unsigned int   bps;
+ int                 session;
+ int                 pause;
+ struct {
+  int                server_type;
+  int                port;
+  int              * proxy_type;
+  char             * proxy;
+  char             * player_name;
+ } cfg;
 } g_inst;
 
@@ -103 +110 @@
 
 void roar_init(void) {
+ ConfigFile * cfgfile;
+
+ cfgfile = xmms_cfg_open_default_file();
+
  g_inst.state = 0;
  g_inst.server = NULL;
  g_inst.session = ctrlsocket_get_session_id();
+
+ xmms_cfg_read_string(cfgfile, "ROAR", "server", &g_inst.server);
+
+ xmms_cfg_read_string(cfgfile, "ROAR", "player_name", &g_inst.cfg.player_name);
+
+ xmms_cfg_free(cfgfile);
+
+ if ( g_inst.cfg.player_name == NULL )
+  g_inst.cfg.player_name = "XMMS";
+
  ROAR_DBG("roar_init(*) = (void)");
 }
@@ -137 +158 @@
 
  if ( !(g_inst.state & STATE_CONNECTED) ) {
-  if ( roar_simple_connect(&(g_inst.con), g_inst.server, "XMMS") == -1 ) {
+  if ( roar_simple_connect(&(g_inst.con), g_inst.server, g_inst.cfg.player_name) == -1 ) {
    return FALSE;
   }