Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins:[4189] trunk/plugins/MyStreamradioV2/Source

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4189
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4189&view=rev
Author:   kroko_koenig
Date:     2011-04-30 19:21:35 +0000 (Sat, 30 Apr 2011)

Log Message:
-----------
change for the beta

Modified Paths:
--------------
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Parser.cs
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs
    trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.suo

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs
===================================================================

--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs	2011-04-30 18:51:53 UTC (rev 4188)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs	2011-04-30 19:21:35 UTC (rev 4189)
@@ -98,7 +98,7 @@
     private string[] favorites;
     private string lastChannel;
 
-    private static OnActionHandler ah;
+    private static OnActionHandler ah = null;
 
     private string actualStation;
     private Parser parser;
@@ -151,16 +151,8 @@
       LoadSettings();
     }
 
-    public override bool Init()
-    {
-      currentFolder = string.Empty;
-      bool bResult = Load(GUIGraphicsContext.Skin + @"\mystreamradio.xml");
-
-      ServicePointManager.DefaultConnectionLimit = 10;
-      return bResult;
-    }
-
     #region Serialisation
+
     void LoadSettings()
     {
       using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
@@ -229,6 +221,7 @@
         displayTime = xmlreader.GetValueAsInt("mystreamradio", "displayTime", 1);
         displayMode = xmlreader.GetValueAsInt("mystreamradio", "displayMode", 1);
 
+        #region icecast / shoutcast
         useIcecast = xmlreader.GetValueAsBool("mystreamradio", "icecast", true);
         useShoutcast = xmlreader.GetValueAsBool("mystreamradio", "shoutcast", true);
 
@@ -262,6 +255,7 @@
             filter = 320;
             break;
         }
+        #endregion
       }
     }
     void SaveSettings()
@@ -306,6 +300,7 @@
         xmlwriter.SetValueAsBool("mystreamradio", "sortascending", sortAscending);
         #endregion
 
+        #region favorites
         if (favorites[0] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav01", favorites[0]);
         if (favorites[1] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav02", favorites[1]);
         if (favorites[2] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav03", favorites[2]);
@@ -316,117 +311,31 @@
         if (favorites[7] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav08", favorites[7]);
         if (favorites[8] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav09", favorites[8]);
         if (favorites[9] != "n.a.") xmlwriter.SetValue("mystreamradio", "Fav10", favorites[9]);
+        #endregion
       }
     }
+
     #endregion
 
     #region BaseWindow Members
-    public override void OnAction(Action action)
-    {
-      //Debug.WriteLine(action.wID);
 
-      // previous menu
-      if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
-      {
-        if (facadeView.Focus)
-        {
-          GUIListItem item = facadeView[0];
-          if (item != null)
-          {
-            if (item.IsFolder && item.Label == "..")
-            {
-              currentFolder = item.Path;
-              LoadDirectory();
-              return;
-            }
-          }
-        }
-      }
-      // show context if not fullscreen
-      if (action.wID == Action.ActionType.ACTION_CONTEXT_MENU)
-      {
-        if (!g_Player.FullScreen)
-        {
-          OnContextMenu();
-        }
-      }
-      // go to parent in sub dirs
-      if (action.wID == Action.ActionType.ACTION_PARENT_DIR)
-      {
-        GUIListItem item = facadeView[0];
-        if (item != null)
-        {
-          if (item.IsFolder && item.Label == "..")
-          {
-            currentFolder = item.Path;
-            LoadDirectory();
-          }
-        }
-        return;
-      }
-
-      base.OnAction(action);
-    }
-    public void OnAction2(Action action)
+    public override bool Init()
     {
-      //System.Diagnostics.Debug.WriteLine("2 " + action.wID.ToString());
+      ServicePointManager.DefaultConnectionLimit = 10;
+      currentFolder = string.Empty;
 
-      // global actions will handeled here e.g. record
-      //Debug.WriteLine("Action2:" + action.wID.ToString());
-      if (action.wID == Action.ActionType.ACTION_RECORD)
-      {
-        OnRecord();
-      }
-
-      if (action.wID == Action.ActionType.ACTION_STOP)
-      {
-        if (EncodeActive())
-          btnRecord.Selected = false;
-      }
-
-      if (g_Player.FullScreen)
-      {
-        if ((action.wID == Action.ActionType.REMOTE_1) ||
-           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 49)))
-        {
-          string[] s = favorites[0].Split('|');
-          if (s.Length == 3) PlayDirect(favorites[0]);
-        }
-        if ((action.wID == Action.ActionType.REMOTE_2) ||
-           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 50)))
-        {
-          string[] s = favorites[1].Split('|');
-          if (s.Length == 3) PlayDirect(favorites[1]);
-        }
-        if ((action.wID == Action.ActionType.REMOTE_3) ||
-           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 51)))
-        {
-          string[] s = favorites[2].Split('|');
-          if (s.Length == 3) PlayDirect(favorites[2]);
-        }
-        if ((action.wID == Action.ActionType.REMOTE_4) ||
-            ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 52)))
-        {
-          string[] s = favorites[3].Split('|');
-          if (s.Length == 3) PlayDirect(favorites[3]);
-        }
-        if ((action.wID == Action.ActionType.REMOTE_5) ||
-           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 53)))
-        {
-          string[] s = favorites[4].Split('|');
-          if (s.Length == 3) PlayDirect(favorites[4]);
-        }
-      }
+      return (Load(GUIGraphicsContext.Skin + @"\mystreamradio.xml"));
     }
-
     protected override void OnPageLoad()
     {
       if (ah == null)
       {
         ah = new OnActionHandler(OnAction2);
-        GUIGraphicsContext.OnNewAction += ah;
       }
 
+      GUIGraphicsContext.OnNewAction -= ah;
+      GUIGraphicsContext.OnNewAction += ah;
+
       g_Player.PlayBackStopped += new g_Player.StoppedHandler(g_Player_PlayBackStopped);
 
       LoadSettings();
@@ -518,8 +427,6 @@
     }
     protected override void OnPageDestroy(int newWindowId)
     {
-      GUIGraphicsContext.OnNewAction -= ah;
-
       selectedItemIndex = facadeView.SelectedListItemIndex;
       SaveSettings();
 
@@ -536,22 +443,6 @@
             GUIPropertyManager.SetProperty("#currentmodule", "StreamRadio");
             return true;
           }
-        case GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED:
-          {
-            int iControl = message.SenderControlId;
-
-            if (iControl == GUIFacadeID)
-            {
-              GUIListItem item = GUIControl.GetSelectedListItem(GetID, GUIFacadeID);
-              if (item != null)
-              {
-                // GetSelectedListItem sets these two so not needed
-                //GUIPropertyManager.SetProperty("#selecteditem", item.Label);
-                //GUIPropertyManager.SetProperty("#selecteditem2", item.Label2);
-              }
-            }
-            break;
-          }
       }
       return base.OnMessage(message);
 
@@ -571,26 +462,26 @@
           {
             case View.List:
               currentView = View.Icons;
-              if (facadeView.ThumbnailView == null)
-                shouldContinue = true;
-              else
-                facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+              //if (facadeView.ThumbnailView == null)
+              //  shouldContinue = true;
+              //else
+                facadeView.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
               break;
 
             case View.Icons:
               currentView = View.LargeIcons;
-              if (facadeView.ThumbnailView == null)
-                shouldContinue = true;
-              else
-                facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+              //if (facadeView.ThumbnailView == null)
+              //  shouldContinue = true;
+              //else
+                facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
               break;
 
             case View.LargeIcons:
               currentView = View.List;
-              if (facadeView.ListView == null)
-                shouldContinue = true;
-              else
-                facadeView.View = GUIFacadeControl.ViewMode.List;
+              //if (facadeView.ListView == null)
+              //  shouldContinue = true;
+              //else
+                facadeView.CurrentLayout = GUIFacadeControl.Layout.List;
               break;
           }
         } while (shouldContinue);
@@ -700,13 +591,13 @@
       switch (currentView)
       {
         case View.List:
-          facadeView.View = GUIFacadeControl.ViewMode.List;
+          facadeView.CurrentLayout = GUIFacadeControl.Layout.List;
           break;
         case View.Icons:
-          facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+          facadeView.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
           break;
         case View.LargeIcons:
-          facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+          facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
           break;
       }
 
@@ -715,6 +606,103 @@
 
     #endregion
 
+    #region OnActions
+
+    public override void OnAction(Action action)
+    {
+      #region prev/contex/parent
+      if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
+      {
+        if (facadeView.Focus)
+        {
+          GUIListItem item = facadeView[0];
+          if (item != null)
+          {
+            if (item.IsFolder && item.Label == "..")
+            {
+              currentFolder = item.Path;
+              LoadDirectory();
+              return;
+            }
+          }
+        }
+      }
+      if (action.wID == Action.ActionType.ACTION_CONTEXT_MENU)
+      {
+        if (!g_Player.FullScreen)
+        {
+          OnContextMenu();
+        }
+      }
+      if (action.wID == Action.ActionType.ACTION_PARENT_DIR)
+      {
+        GUIListItem item = facadeView[0];
+        if (item != null)
+        {
+          if (item.IsFolder && item.Label == "..")
+          {
+            currentFolder = item.Path;
+            LoadDirectory();
+          }
+        }
+        return;
+      }
+      #endregion
+
+      base.OnAction(action);
+    }
+    public void OnAction2(Action action)
+    {
+      if (action.wID == Action.ActionType.ACTION_RECORD)
+      {
+        OnRecord();
+      }
+
+      if (action.wID == Action.ActionType.ACTION_STOP)
+      {
+        if (EncodeActive())
+          btnRecord.Selected = false;
+      }
+
+      #region favorites is fullscreen
+      if ((g_Player.FullScreen) && (StreamradioIsPlaying()))
+      {
+        if ((action.wID == Action.ActionType.REMOTE_1) ||
+           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 49)))
+        {
+          string[] s = favorites[0].Split('|');
+          if (s.Length == 3) PlayDirect(favorites[0]);
+        }
+        if ((action.wID == Action.ActionType.REMOTE_2) ||
+           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 50)))
+        {
+          string[] s = favorites[1].Split('|');
+          if (s.Length == 3) PlayDirect(favorites[1]);
+        }
+        if ((action.wID == Action.ActionType.REMOTE_3) ||
+           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 51)))
+        {
+          string[] s = favorites[2].Split('|');
+          if (s.Length == 3) PlayDirect(favorites[2]);
+        }
+        if ((action.wID == Action.ActionType.REMOTE_4) ||
+            ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 52)))
+        {
+          string[] s = favorites[3].Split('|');
+          if (s.Length == 3) PlayDirect(favorites[3]);
+        }
+        if ((action.wID == Action.ActionType.REMOTE_5) ||
+           ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (action.m_key.KeyChar == 53)))
+        {
+          string[] s = favorites[4].Split('|');
+          if (s.Length == 3) PlayDirect(favorites[4]);
+        }
+      }
+      #endregion
+    }
+
+    #endregion
+
     #region Events & timers
     private void g_Player_PlayBackStopped(g_Player.MediaType type, int stoptime, string filename)
     {
@@ -800,7 +788,7 @@
 
           if (parser != null)
           {
-            if ((parser.Title != "") && (parser.Title != "..."))
+            if ((parser.Title != "") && (parser.Title != "...") && (parser.Title != null))
             {
               GUIPropertyManager.SetProperty("#Play.Current.Title", parser.Title.Trim());
               GUIPropertyManager.SetProperty("#Play.Current.Artist", parser.Artist.Trim());
@@ -1517,136 +1505,105 @@
       #endregion
     }
 
-    private bool EncodeActive()
+    private void OnRecord()
     {
-
-      try
+      if (StreamradioIsPlaying())
       {
-        if (MediaPortal.Visualization.VisualizationBase.Bass.Initialized)
+        if (!engine.Contains("BASS"))
         {
-          int _stream = (int)MediaPortal.Visualization.VisualizationBase.Bass.CurrentAudioStream;
-          if (_stream != 0)
-          {
-            if (lame == null) return false;
-            if (lame.IsActive) return true;
-          }
+          GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+          dlg.SetHeading("BASS engine is not active !");
+          dlg.SetLine(1, "Recording is not possible !");
+          dlg.SetLine(2, "Activate BASS engine under Music /");
+          dlg.SetLine(3, "Player Settings.");
+          dlg.DoModal(GUIWindowManager.ActiveWindow);
         }
-      }
-      catch (Exception e)
-      {
-        Log.Error("Error getting current BASS Audio Stream." + "\n" + e.Message);
-      }
-
-      return false;
-    }
-
-    private void OnRecord()
-    {
-      if (!engine.Contains("BASS"))
-      {
-        GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
-        dlg.SetHeading("BASS engine is not active !");
-        dlg.SetLine(1, "Recording is not possible !");
-        dlg.SetLine(2, "Activate BASS engine under Music /");
-        dlg.SetLine(3, "Player Settings.");
-        dlg.DoModal(GUIWindowManager.ActiveWindow);
-      }
-      else
-      {
-        if ((g_Player.Playing) && (!g_Player.CurrentFile.StartsWith(Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config))))
+        else
         {
-          int _stream = (int)MediaPortal.Visualization.VisualizationBase.Bass.CurrentAudioStream;
-
-          if (_stream != 0)
+          if ((g_Player.Playing) && (!g_Player.CurrentFile.StartsWith(Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config))))
           {
-            if (!EncodeActive())
+            int _stream = (int)MediaPortal.Visualization.VisualizationBase.Bass.CurrentAudioStream;
+
+            if (_stream != 0)
             {
-              Log.Debug("MyStreamRadio | start recording");
+              if (!EncodeActive())
+              {
+                Log.Debug("MyStreamRadio | start recording");
 
-              #region build file name
-              string[] now = actualStation.Split('|');
-              if (now.Length != 3) return;
+                #region build file name
+                string[] now = actualStation.Split('|');
+                if (now.Length != 3) return;
 
-              string fName = now[0];
-              string url = now[1];
-              string file = now[2];
+                string fName = now[0];
+                string url = now[1];
+                string file = now[2];
 
-              Regex regex = new Regex(@"[\\/:*?<>|\b]");
-              fName = regex.Replace(fName, "_");
-              fName = fName.Replace(' ', '_');
-              fName = fName.Replace('.', '_');
-              fName = fName.Replace('!', '_');
-              fName = fName.Replace('"', '_');
-              fName = fName.Replace('\'', '_');
-              fName = fName.Replace('*', '_');
+                Regex regex = new Regex(@"[\\/:*?<>|\b]");
+                fName = regex.Replace(fName, "_");
+                fName = fName.Replace(' ', '_');
+                fName = fName.Replace('.', '_');
+                fName = fName.Replace('!', '_');
+                fName = fName.Replace('"', '_');
+                fName = fName.Replace('\'', '_');
+                fName = fName.Replace('*', '_');
 
-              if (!recordFolder.EndsWith("\\"))
-                recordFolder = recordFolder + "\\";
+                if (!recordFolder.EndsWith("\\"))
+                  recordFolder = recordFolder + "\\";
 
-              string name = fName + "_";
+                string name = fName + "_";
 
-              name += DateTime.Now.Year.ToString() + "_";
-              name += string.Format("{0:00}", DateTime.Now.Month) + "_";
-              name += string.Format("{0:00}", DateTime.Now.Day) + "_";
+                name += DateTime.Now.Year.ToString() + "_";
+                name += string.Format("{0:00}", DateTime.Now.Month) + "_";
+                name += string.Format("{0:00}", DateTime.Now.Day) + "_";
 
-              name += string.Format("{0:00}", DateTime.Now.Hour);
-              name += string.Format("{0:00}", DateTime.Now.Minute);
+                name += string.Format("{0:00}", DateTime.Now.Hour);
+                name += string.Format("{0:00}", DateTime.Now.Minute);
 
-              name = name.Replace('.', '_');
-              name = name.Replace(':', '_');
+                name = name.Replace('.', '_');
+                name = name.Replace(':', '_');
 
-              #endregion
+                #endregion
 
-              string recordFile = recordFolder + name + ".mp3";
-              Log.Debug("MyStreamRadio | record file : " + recordFile);
+                string recordFile = recordFolder + name + ".mp3";
+                Log.Debug("MyStreamRadio | record file : " + recordFile);
 
-              lame = new EncoderLAME(_stream);
-              lame.InputFile = null;
-              lame.OutputFile = recordFile;
-              lame.LAME_Bitrate = (int)EncoderLAME.BITRATE.kbps_192;
-              lame.LAME_Mode = EncoderLAME.LAMEMode.Default;
-              lame.LAME_TargetSampleRate = (int)EncoderLAME.SAMPLERATE.Hz_44100;
-              lame.LAME_Quality = EncoderLAME.LAMEQuality.Quality;
+                lame = new EncoderLAME(_stream);
+                lame.InputFile = null;
+                lame.OutputFile = recordFile;
+                lame.LAME_Bitrate = (int)EncoderLAME.BITRATE.kbps_192;
+                lame.LAME_Mode = EncoderLAME.LAMEMode.Default;
+                lame.LAME_TargetSampleRate = (int)EncoderLAME.SAMPLERATE.Hz_44100;
+                lame.LAME_Quality = EncoderLAME.LAMEQuality.Quality;
 
-              bool result = lame.Start(null, IntPtr.Zero, false);
+                bool result = lame.Start(null, IntPtr.Zero, false);
 
-              if (result == true)
-              {
-                Log.Debug("MyStreamRadio | recording works");
+                if (result == true)
+                {
+                  Log.Debug("MyStreamRadio | recording works");
+                }
+                else
+                {
+                  Log.Debug("MyStreamRadio | recording did NOT work");
+                  lame.Stop();
+                }
               }
               else
               {
-                Log.Debug("MyStreamRadio | recording did NOT work");
+                Log.Debug("MyStreamRadio | stop recording");
                 lame.Stop();
               }
             }
             else
             {
-              Log.Debug("MyStreamRadio | stop recording");
-              lame.Stop();
+              Log.Debug("MyStreamRadio | no stream found !");
+              // no stream
             }
           }
-          else
-          {
-            Log.Debug("MyStreamRadio | no stream found !");
-            // no stream
-          }
         }
       }
-
       btnRecord.Selected = EncodeActive();
     }
 
-    private bool IsUrl(string fileName)
-    {
-      if (fileName.ToLower().StartsWith("http:") || fileName.ToLower().StartsWith("https:") ||
-      fileName.ToLower().StartsWith("mms:") || fileName.ToLower().StartsWith("rtsp:"))
-      {
-        return true;
-      }
-      return false;
-    }
-
     private void Play(GUIListItem item)
     {
       RadioStation station = item.MusicTag as RadioStation;
@@ -1890,5 +1847,45 @@
 
     #endregion
 
+    #region some helper methods
+
+    private bool IsUrl(string fileName)
+    {
+      if (fileName.ToLower().StartsWith("http:") || fileName.ToLower().StartsWith("https:") ||
+      fileName.ToLower().StartsWith("mms:") || fileName.ToLower().StartsWith("rtsp:"))
+      {
+        return true;
+      }
+      return false;
+    }
+    private bool EncodeActive()
+    {
+      try
+      {
+        if (MediaPortal.Visualization.VisualizationBase.Bass.Initialized)
+        {
+          int _stream = (int)MediaPortal.Visualization.VisualizationBase.Bass.CurrentAudioStream;
+          if (_stream != 0)
+          {
+            if (lame == null) return false;
+            if (lame.IsActive) return true;
+          }
+        }
+      }
+      catch (Exception e)
+      {
+        Log.Error("Error getting current BASS Audio Stream." + "\n" + e.Message);
+      }
+
+      return false;
+    }
+    private bool StreamradioIsPlaying()
+    {
+      if (currentFile == g_Player.CurrentFile) return true;
+      return false;
+    }
+
+    #endregion
+
   }
 }
\ No newline at end of file

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs	2011-04-30 18:51:53 UTC (rev 4188)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs	2011-04-30 19:21:35 UTC (rev 4189)
@@ -416,23 +416,23 @@
       int itemIndex = GetSelectedItemNo();
       if (mapSettings.ViewAs == (int)View.BigIcons)
       {
-        facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+        facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
       }
       else if (mapSettings.ViewAs == (int)View.Albums)
       {
-        facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+        facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
       }
       else if (mapSettings.ViewAs == (int)View.Icons)
       {
-        facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+        facadeView.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
       }
       else if (mapSettings.ViewAs == (int)View.List)
       {
-        facadeView.View = GUIFacadeControl.ViewMode.List;
+        facadeView.CurrentLayout = GUIFacadeControl.Layout.List;
       }
       else if (mapSettings.ViewAs == (int)View.Filmstrip)
       {
-        facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
+        facadeView.CurrentLayout = GUIFacadeControl.Layout.Filmstrip;
       }
       if (itemIndex > -1)
       {

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj	2011-04-30 18:51:53 UTC (rev 4188)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj	2011-04-30 19:21:35 UTC (rev 4189)
@@ -39,6 +39,11 @@
       <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Core, Version=1.0.5.32056, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Parser.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Parser.cs	2011-04-30 18:51:53 UTC (rev 4188)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Parser.cs	2011-04-30 19:21:35 UTC (rev 4189)
@@ -163,10 +163,10 @@
                         string[] lines = HTML.Split('\n');
                         string line;
 
-                        string data = "";
+                        string data = string.Empty;
 
-                        string a = "";
-                        string t = "";
+                        string a = string.Empty;
+                        string t = string.Empty;
 
                         int x = 0;
                         int y = 0;
@@ -209,9 +209,12 @@
                                     x = data.IndexOf(actStation.Devider);
                                     if (x > 0)
                                     {
+                                      if (t == string.Empty)
+                                      {
                                         t = ConvStr(data.Substring(x + actStation.Devider.Length));
                                         a = ConvStr(data.Substring(0, x));
                                         ParserLog("Method 1: found title= " + t + " artist= " + a);
+                                      }
                                     }
 
                                     if (actStation.Image != "")
@@ -721,8 +724,8 @@
                                 string[] each = artistTitle.Split('-');
                                 if (each.Length == 2)
                                 {
-                                    actStation.Artist = each[0];
-                                    actStation.Title = each[1];
+                                  actStation.Artist = ConvStr(each[0]);
+                                  actStation.Title = ConvStr(each[1]);
                                 }
                             }
                         }

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs	2011-04-30 18:51:53 UTC (rev 4188)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs	2011-04-30 19:21:35 UTC (rev 4189)
@@ -2,6 +2,11 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using MediaPortal.Common.Utils;
+[assembly: CompatibleVersion("1.1.7.0")]
+[assembly: UsesSubsystem("MP.SkinEngine")]
+[assembly: UsesSubsystem("MP.Config")]
+
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die mit einer Assembly verknüpft sind.

Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.suo
===================================================================
(Binary files differ)


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




Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins:[4189] trunk/plugins/MyStreamradioV2/Source

mp-plugins-svn