Merge tag 'branchpoint-5.1' into release

[disorder] / disobedience / log.c

diff --git a/disobedience/log.c b/disobedience/log.c
index 9a94e0630cfe3ef9fa13f8dbc177ad8faf681c21..2fd04a10c339acf2aeedabff2aef8295e12a2907 100644 (file)
--- a/disobedience/log.c
+++ b/disobedience/log.c
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2006, 2007 Richard Kettlewell
  *
  * This file is part of DisOrder.
  * Copyright (C) 2006, 2007 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
  * 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.
  *
  * (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
  * 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 disobedience/log.c
  * @brief State monitoring
  */
 /** @file disobedience/log.c
  * @brief State monitoring


@@ -43,12 +41,15 @@ static void log_state(void *v, unsigned long state);
 static void log_volume(void *v, int l, int r);
 static void log_rescanned(void *v);
 static void log_rights_changed(void *v, rights_type r);
 static void log_volume(void *v, int l, int r);
 static void log_rescanned(void *v);
 static void log_rights_changed(void *v, rights_type r);

+static void log_adopted(void *v, const char *id, const char *user);

 static void log_playlist_created(void *v,
                                  const char *playlist, const char *sharing);
 static void log_playlist_modified(void *v,
                                   const char *playlist, const char *sharing);
 static void log_playlist_deleted(void *v,
                                  const char *playlist);
 static void log_playlist_created(void *v,
                                  const char *playlist, const char *sharing);
 static void log_playlist_modified(void *v,
                                   const char *playlist, const char *sharing);
 static void log_playlist_deleted(void *v,
                                  const char *playlist);

+static void log_global_pref(void *v,
+                            const char *name, const char *value);

 
 /** @brief Callbacks for server state monitoring */
 const disorder_eclient_log_callbacks log_callbacks = {
 
 /** @brief Callbacks for server state monitoring */
 const disorder_eclient_log_callbacks log_callbacks = {


@@ -66,9 +67,11 @@ const disorder_eclient_log_callbacks log_callbacks = {
   .volume = log_volume,
   .rescanned = log_rescanned,
   .rights_changed = log_rights_changed,
   .volume = log_volume,
   .rescanned = log_rescanned,
   .rights_changed = log_rights_changed,

+  .adopted = log_adopted,

   .playlist_created = log_playlist_created,
   .playlist_modified = log_playlist_modified,
   .playlist_deleted = log_playlist_deleted,
   .playlist_created = log_playlist_created,
   .playlist_modified = log_playlist_modified,
   .playlist_deleted = log_playlist_deleted,

+  .global_pref = log_global_pref,

 };
 
 /** @brief Update everything */
 };
 
 /** @brief Update everything */


@@ -115,6 +118,7 @@ static void log_moved(void attribute((unused)) *v,
 static void log_playing(void attribute((unused)) *v,
                         const char attribute((unused)) *track,
                         const char attribute((unused)) *user) {
 static void log_playing(void attribute((unused)) *v,
                         const char attribute((unused)) *track,
                         const char attribute((unused)) *user) {

+  event_raise("playing-started", 0);

 }
 
 /** @brief Called when a track is added to the queue */
 }
 
 /** @brief Called when a track is added to the queue */


@@ -213,6 +217,13 @@ static void log_rights_changed(void attribute((unused)) *v,
   --suppress_actions;
 }
 
   --suppress_actions;
 }
 

+/** @brief Called when a track is adopted */
+static void log_adopted(void attribute((unused)) *v,
+                        const char attribute((unused)) *id,
+                        const char attribute((unused)) *who) {
+  event_raise("queue-changed", 0);
+}
+

 static void log_playlist_created(void attribute((unused)) *v,
                                  const char *playlist,
                                  const char attribute((unused)) *sharing) {
 static void log_playlist_created(void attribute((unused)) *v,
                                  const char *playlist,
                                  const char attribute((unused)) *sharing) {


@@ -230,6 +241,12 @@ static void log_playlist_deleted(void attribute((unused)) *v,
   event_raise("playlist-deleted", (void *)playlist);
 }
 
   event_raise("playlist-deleted", (void *)playlist);
 }
 

+static void log_global_pref(void attribute((unused)) *v,
+                            const char *name,
+                            const char attribute((unused)) *value) {
+  event_raise("global-pref", (void *)name);
+}
+

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2