Correct setting of rtp-source-port.

[disorder] / server / rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index 04ffba460febe43ec5e8e5d747e5ba3134474fd1..1380e24fd493709bc188011b0b9104b2c745cfd2 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -2,24 +2,27 @@
  * This file is part of DisOrder 
  * Copyright (C) 2005-2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program 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 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program 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.
- *
+ * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file server/rescan.c
+ * @brief Rescanning utility
+ *
+ * Invoked by the server.
  */
-
 #include "disorder-server.h"
 
+static time_t last_report;
 static DB_TXN *global_tid;
 
 static const struct option options[] = {
@@ -131,8 +134,10 @@ static void rescan_collection(const struct collection *c) {
     if(n < config->player.n) {
       nnew += !!trackdb_notice(track, path);
       ++ntracks;
-      if(ntracks % 1000 == 0)
+      if(ntracks % 100 == 0 && time(0) > last_report + 10) {
         info("rescanning %s, %ld tracks so far", c->root, ntracks);
+        time(&last_report);
+      }
     }
   }
   /* tidy up */
@@ -295,11 +300,12 @@ static void recheck_collection(const struct collection *c) {
       return;
     recheck_track(&cs, t);
     ++nrc;
-    if(nrc % 100 == 0) {
+    if(nrc % 100 == 0 && time(0) > last_report + 10) {
       if(c)
         info("rechecking %s, %ld tracks so far", c->root, nrc);
       else
         info("rechecking all tracks, %ld tracks so far", nrc);
+      time(&last_report);
     }
   }
   if(c)