[Mt-daapd-cvs] SF.net SVN: mt-daapd: [1445] branches/fixes-0.2.1.1

[<rp...@us...>]

Revision: 1445
          http://svn.sourceforge.net/mt-daapd/?rev=1445&view=rev
Author:   rpedde
Date:     2006-11-27 17:02:51 -0800 (Mon, 27 Nov 2006)

Log Message:
-----------
Finalize avahi rendezvous client

Modified Paths:
--------------
    branches/fixes-0.2.1.1/configure.in
    branches/fixes-0.2.1.1/src/main.c

Modified: branches/fixes-0.2.1.1/configure.in
===================================================================
--- branches/fixes-0.2.1.1/configure.in	2006-11-27 00:17:12 UTC (rev 1444)
+++ branches/fixes-0.2.1.1/configure.in	2006-11-28 01:02:51 UTC (rev 1445)
@@ -51,7 +51,7 @@
 		      [ case "${enableval}" in
                         yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
 			rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
-			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI -DWITHOUT_MDNS";;
+			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
 		        no)  rend_avahi=false;;
 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
 		      esac ])

Modified: branches/fixes-0.2.1.1/src/main.c
===================================================================
--- branches/fixes-0.2.1.1/src/main.c	2006-11-27 00:17:12 UTC (rev 1444)
+++ branches/fixes-0.2.1.1/src/main.c	2006-11-28 01:02:51 UTC (rev 1445)
@@ -895,12 +895,6 @@
     }
 #endif
 
-#ifdef WITH_AVAHI
-    if(config.use_mdns) {
-        DPRINTF(E_LOG, L_MAIN|L_REND, "Registering rendezvous names via avahi\n");
-        rend_avahi_start(config.servername,config.port,config.iface);
-    }
-#endif
     end_time=time(NULL);
 
     DPRINTF(E_LOG,L_MAIN,"Scanned %d songs in  %d seconds\n",db_get_song_count(),
@@ -945,13 +939,6 @@
     }
 #endif
 
-#ifdef WITH_AVAHI
-    if(config.use_mdns) {
-            DPRINTF(E_LOG, L_MAIN|L_REND, "Stop publishing daap with avahi\n");
-            rend_avahi_stop();
-    }
-#endif
-
     DPRINTF(E_LOG,L_MAIN,"Stopping signal handler\n");
     if(!pthread_kill(signal_tid,SIGINT)) {
         pthread_join(signal_tid,NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.