[tuxdroid-svn] r5151 - software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser

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

Author: jerome
Date: 2009-07-23 22:43:44 +0200 (Thu, 23 Jul 2009)
New Revision: 5151

Modified:
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.dcu
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Fixed a bug with unmute function.

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.dcu
===================================================================
(Binary files differ)

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas	2009-07-23 20:35:56 UTC (rev 5150)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas	2009-07-23 20:43:44 UTC (rev 5151)
@@ -4,7 +4,7 @@
 
 uses
     ShellAPI, Registry, SysUtils, Variants, Classes, TlHelp32, LibXmlParser,
-    LibXmlComps, TXmlThread, ComCtrls, StdCtrls, OleCtrls, Controls, Windows,
+    LibXmlComps, ComCtrls, StdCtrls, OleCtrls, Controls, Windows,
     EmbeddedWB, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
     IdHTTP, dialogs;
 
@@ -252,22 +252,22 @@
   else
     begin
       //proceeding to mute.
-      request_result := TuxUtils.DownloadHTTP(command_on);
+      request_result := TuxUtils.DownloadHTTP(command_mute);
     end;
 
   try
     //Getting the request result <result>.
-    beginPos := Pos('<result>', aString) + Length('<result>');
-    endPos := Pos('</result>', aString);
+    beginPos := Pos('<result>', request_result) + Length('<result>');
+    endPos := Pos('</result>', request_result);
 
-    if Copy(aString, beginPos, endPos - beginPos) = 'success' then
+    if Copy(request_result, beginPos, endPos - beginPos) = 'Success' then
       result := true
     else
       result := false;
   except
     on e : Exception do
       result := false;
-      
+  end;
 end;
 
 

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-07-23 20:35:56 UTC (rev 5150)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-07-23 20:43:44 UTC (rev 5151)
@@ -146,15 +146,22 @@
 
 //Tray icon 'mute' click.
 procedure TForm1.Mute1Click(Sender: TObject);
+var
+  toggled : boolean;
 begin
-  {TODO : Update this code when tuxdroid server can sent mute states.}
-  if Mute1.ImageIndex <> 5 then
-  begin
-    Mute1.ImageIndex := 5;
-  end
-  else
-  begin
-    Mute1.ImageIndex := -1;
+  //toggle mute
+  toggled := TuxUtils.toggleMute();
+
+  if toggled then
+    begin
+      if Mute1.ImageIndex <> 5 then
+        begin
+          Mute1.ImageIndex := 5;
+        end
+      else
+        begin
+          Mute1.ImageIndex := -1;
+    end;
   end;
 
 end;