[tuxdroid-svn] r736 - daemon/trunk/libs

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2007-11-27 16:19:02 +0100 (Tue, 27 Nov 2007)
New Revision: 736

Modified:
   daemon/trunk/libs/USBDaemon_command_tux.c
   daemon/trunk/libs/USBDaemon_status_table.c
   daemon/trunk/libs/USBDaemon_status_table.h
Log:
* Removed a ducplicate or record_state in the status.



Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-11-27 14:57:05 UTC (rev 735)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-11-27 15:19:02 UTC (rev 736)
@@ -642,7 +642,7 @@
         result[2] = tux_status.audio.streaming;
         break;
     case DATA_PROGRAMMING_AUDIO:
-        result[1] = tux_status.audio.record;
+        result[1] = tux_status.audio.record_state;
         result[2] = tux_status.audio.last_block_size;
         break; 
     case DATA_STATUS_EYES_POSITION_COUNTER:

Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c	2007-11-27 14:57:05 UTC (rev 735)
+++ daemon/trunk/libs/USBDaemon_status_table.c	2007-11-27 15:19:02 UTC (rev 736)
@@ -660,7 +660,7 @@
         break;
 
     case STATUS_FLASH_PROG_CMD:
-        tux_status.audio.record = new_status[1];
+        tux_status.audio.record_state = new_status[1];
         tux_status.audio.last_block_size = new_status[2];
         flash_programming_event(new_status[1], new_status[2]);
         break;

Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h	2007-11-27 14:57:05 UTC (rev 735)
+++ daemon/trunk/libs/USBDaemon_status_table.h	2007-11-27 15:19:02 UTC (rev 736)
@@ -377,8 +377,10 @@
                           link */
         bool mute;      /**< Set when the amplifier has been muted */
         audiorec_status_t record_state; /**< States of the recording process */
-	unsigned int record;
-	unsigned int last_block_size;
+        unsigned int last_block_size;   /**< Size of the last recorded audio
+                                          segment. This can be used by the
+                                          recording process to determine if the
+                                          correct length has been recorded. */
     } audio;
 
     /** Raw I/O status */