Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / speaker-protocol.h

diff --git a/lib/speaker-protocol.h b/lib/speaker-protocol.h
index 24fc970587d7f748e1b6aa3db3e23a9fe2b58d69..4a8d3aa643c1ecbc6b9864173d4b3c35af5a7b85 100644 (file)
--- a/lib/speaker-protocol.h
+++ b/lib/speaker-protocol.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008, 2013 Richard Kettlewell

  *
  * 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
  *
  * 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


@@ -26,17 +26,22 @@
 #define SPEAKER_PROTOCOL_H
 
 #include "byte-order.h"
 #define SPEAKER_PROTOCOL_H
 
 #include "byte-order.h"

+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif

 
 /** @brief A message from the main server to the speaker, or vica versa */
 struct speaker_message {
   /** @brief Message type
    *
 
 /** @brief A message from the main server to the speaker, or vica versa */
 struct speaker_message {
   /** @brief Message type
    *

-   * Messges from the main server:
+   * Messages from the main server:

    * - @ref SM_PLAY
    * - @ref SM_PAUSE
    * - @ref SM_RESUME
    * - @ref SM_CANCEL
    * - @ref SM_RELOAD
    * - @ref SM_PLAY
    * - @ref SM_PAUSE
    * - @ref SM_RESUME
    * - @ref SM_CANCEL
    * - @ref SM_RELOAD

+   * - @ref SM_RTP_REQUEST
+   * - @ref SM_RTP_CANCEL

    *
    * Messages from the speaker:
    * - @ref SM_PAUSED
    *
    * Messages from the speaker:
    * - @ref SM_PAUSED


@@ -50,8 +55,13 @@ struct speaker_message {
   /** @brief Message-specific data */
   long data;
 
   /** @brief Message-specific data */
   long data;
 

-  /** @brief Track ID (including 0 terminator) */
-  char id[24];                          /* ID including terminator */
+  union {
+    /** @brief Track ID (including 0 terminator) */
+    char id[24];                          /* ID including terminator */
+
+    /** @brief An IP address (for @ref SM_RTP_REQUEST and @ref SM_RTP_CANCEL) */
+    struct sockaddr_storage address;
+  } u;

 };
 
 /* messages from the main DisOrder server */
 };
 
 /* messages from the main DisOrder server */


@@ -74,6 +84,12 @@ struct speaker_message {
 /** @brief Reload configuration */
 #define SM_RELOAD 5
 
 /** @brief Reload configuration */
 #define SM_RELOAD 5
 

+/** @brief Reload configuration */
+#define SM_RTP_REQUEST 6
+
+/** @brief Reload configuration */
+#define SM_RTP_CANCEL 7
+

 /* messages from the speaker */
 /** @brief Paused track @c id, @c data seconds in
  *
 /* messages from the speaker */
 /** @brief Paused track @c id, @c data seconds in
  *