[Mp-plugins-svn] SF.net SVN: mp-plugins: [261] trunk/plugins/TV3ExtChannelChanger

[<an...@us...>]

Revision: 261
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=261&view=rev
Author:   and-81
Date:     2007-03-29 21:30:54 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/TV3ExtChannelChanger/ReadMe.txt
    trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs

Modified: trunk/plugins/TV3ExtChannelChanger/ReadMe.txt
===================================================================
--- trunk/plugins/TV3ExtChannelChanger/ReadMe.txt	2007-03-29 22:07:25 UTC (rev 260)
+++ trunk/plugins/TV3ExtChannelChanger/ReadMe.txt	2007-03-30 04:30:54 UTC (rev 261)
@@ -1,4 +1,4 @@
-TV3 External Channel Changer v1.0.2
+TV3 External Channel Changer v1.0.3
 -------------------------------------
 
 Adds External Channel Changing to the TV Server.

Modified: trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs
===================================================================
--- trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs	2007-03-29 22:07:25 UTC (rev 260)
+++ trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs	2007-03-30 04:30:54 UTC (rev 261)
@@ -92,10 +92,8 @@
     [CLSCompliant(false)]
     public void Start(IController controller)
     {
-      Log.Info("TV3ExtChannelChanger: Version {0}", PluginVersion);
+      Log.Info("TV3ExtChannelChanger: Start");
 
-      Log.Debug("TV3ExtChannelChanger: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
       TvBusinessLayer layer = new TvBusinessLayer();
       LogVerbose = Convert.ToBoolean(layer.GetSetting("TV3ExtChannelChangerLogVerbose", "False").Value);
 
@@ -106,6 +104,8 @@
 
     public void Stop()
     {
+      Log.Info("TV3ExtChannelChanger: Stop");
+
       GlobalServiceProvider.Instance.Get<ITvServerEvent>().OnTvServerEvent -= new TvServerEventHandler(events_OnTvServerEvent);
     }
 
@@ -122,18 +122,17 @@
     void events_OnTvServerEvent(object sender, EventArgs eventArgs)
     {
       TvServerEventArgs tvEvent = (TvServerEventArgs)eventArgs;
+      if (tvEvent.EventType != TvServerEventType.StartZapChannel)
+        return;
+      
       AnalogChannel analogChannel = tvEvent.channel as AnalogChannel;
-
       if (analogChannel == null)
         return;
       
-      if (tvEvent.EventType == TvServerEventType.StartZapChannel)
-      {
-        if (LogVerbose)
-          Log.Info("TV3ExtChannelChanger: Card: {0}, Channel: {1}, {2}", tvEvent.Card.Id, analogChannel.ChannelNumber, analogChannel.Name);
+      if (LogVerbose)
+        Log.Info("TV3ExtChannelChanger: Card: {0}, Channel: {1}, {2}", tvEvent.Card.Id, analogChannel.ChannelNumber, analogChannel.Name);
         
-        ProcessExternalChannel(analogChannel.ChannelNumber.ToString(), tvEvent.Card.Id);
-      }
+      ProcessExternalChannel(analogChannel.ChannelNumber.ToString(), tvEvent.Card.Id);
     }
 
     static bool ProcessExternalChannel(string externalChannel, int cardId)
@@ -309,7 +308,7 @@
       }
       catch (Exception ex)
       {
-        Log.Error("TV3ExtChannelChanger: ProcessExternalChannel() {0}", ex.Message);
+        Log.Error("TV3ExtChannelChanger - ProcessExternalChannel(): {0}", ex.Message);
         returnCode = false;
       }
 
@@ -441,7 +440,7 @@
       }
       catch (Exception ex)
       {
-        Log.Error("TV3ExtChannelChanger: ProcessRunCommand() {0}", ex.Message);
+        Log.Error("TV3ExtChannelChanger - ProcessRunCommand(): {0}", ex.Message);
         return false;
       }
 
@@ -513,7 +512,7 @@
       }
       catch (Exception ex)
       {
-        Log.Error("TV3ExtChannelChanger: ProcessSerialCommand() {0}", ex.Message);
+        Log.Error("TV3ExtChannelChanger - ProcessSerialCommand(): {0}", ex.Message);
 
         if (serialPort != null)
           serialPort.Close();
@@ -605,7 +604,7 @@
       }
       catch (Exception ex)
       {
-        Log.Error("TV3ExtChannelChanger: Error processing Message Command: {0}", ex.Message);
+        Log.Error("TV3ExtChannelChanger - ProcessMessageCommand(): {0}", ex.Message);
         return false;
       }
     }
@@ -629,7 +628,7 @@
       }
       catch (Exception ex)
       {
-        Log.Error("TV3ExtChannelChanger: Error processing Key Command \"{0}\"", ex.Message);
+        Log.Error("TV3ExtChannelChanger - ProcessKeyCommand(): {0}", ex.Message);
         return false;
       }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.