Playlist now created in plugin instead of in menu.

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@25 e10066b5-e1e2-0310-b819-94efdf66514b

4 files changed, 37 insertions, 18 deletions

diff --git a/muggle-plugin/muggle.c b/muggle-plugin/muggle.c
index 481c699..845eab3 100644
--- a/muggle-plugin/muggle.c
+++ b/muggle-plugin/muggle.c
@@ -2,8 +2,8 @@
 /*! \file   muggle.c
  *  \brief  Implements a plugin for browsing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.1 $
- * \date    $Date: 2004/02/01 18:22:53 $
+ * \version $Revision: 1.2 $
+ * \date    $Date: 2004/02/03 19:28:46 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  */
@@ -14,8 +14,13 @@ static const char *DESCRIPTION    = "Access GiantDisc database contents";
 static const char *MAINMENUENTRY  = "Muggle";
 
 #include "muggle.h"
+
 #include "vdr_menu.h"
+
 #include "mg_tools.h"
+#include "mg_content_interface.h"
+#include "mg_media.h"
+
 
 const char* mgMuggle::Version(void)
 { 
@@ -67,6 +72,10 @@ bool mgMuggle::Start(void)
   // Start any background activities the plugin shall perform.
   mgSetDebugLevel( 99 );
 
+  m_media = new mgMedia( mgMedia::GD_MP3 );
+  m_root  = m_media->getSelectionRoot();
+  m_playlist = m_media->createTemporaryPlaylist();
+
   return true;
 }
 
@@ -78,7 +87,7 @@ void mgMuggle::Housekeeping(void)
 cOsdObject *mgMuggle::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  cOsdObject* osd = new mgMainMenu();
+  cOsdObject* osd = new mgMainMenu( m_media, m_root, m_playlist );
 
   return osd;
 }
diff --git a/muggle-plugin/muggle.h b/muggle-plugin/muggle.h
index e2e9bba..c5c0d04 100644
--- a/muggle-plugin/muggle.h
+++ b/muggle-plugin/muggle.h
@@ -2,8 +2,8 @@
 /*! \file   muggle.h
  *  \brief  Implements a plugin for browsing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.3 $
- * \date    $Date: 2004/02/03 00:13:24 $
+ * \version $Revision: 1.4 $
+ * \date    $Date: 2004/02/03 19:28:46 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  */
@@ -20,6 +20,10 @@
   #include <plugin.h>
 #endif
 
+class mgMedia;
+class mgSelectionTreeNode;
+class mgPlaylist;
+
 class mgMuggle : public cPlugin
 {
 public:
@@ -51,6 +55,10 @@ public:
   virtual bool SetupParse(const char *Name, const char *Value);
 
 private:
+
+  mgMedia             *m_media;
+  mgSelectionTreeNode *m_root;
+  mgPlaylist          *m_playlist;
     
 };
 
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c
index a21d664..0bcf5e6 100644
--- a/muggle-plugin/vdr_menu.c
+++ b/muggle-plugin/vdr_menu.c
@@ -2,12 +2,12 @@
 /*! \file   vdr_menu.c
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.7 $
- * \date    $Date: 2004/02/03 19:15:08 $
+ * \version $Revision: 1.8 $
+ * \date    $Date: 2004/02/03 19:28:46 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  *
- * $Id: vdr_menu.c,v 1.7 2004/02/03 19:15:08 LarsAC Exp $
+ * $Id: vdr_menu.c,v 1.8 2004/02/03 19:28:46 LarsAC Exp $
  */
 /*******************************************************************/
 
@@ -53,17 +53,14 @@ void mgMenuTreeItem::Set()
 
 // ----------------------- mgMainMenu ----------------------
 
-mgMainMenu::mgMainMenu()
-  : cOsdMenu( "" )
+mgMainMenu::mgMainMenu(mgMedia *media, mgSelectionTreeNode *root, mgPlaylist *playlist)
+  : cOsdMenu( "" ), m_media(media), m_root(root), m_current_playlist(playlist)
 {
   mgDebug( 1,  "Creating Muggle Main Menu" );
   
   SetTitle( "Muggle Media Database" );
   SetButtons();
 
-  m_media = new mgMedia( mgMedia::GD_MP3 );
-  m_root  = m_media->getSelectionRoot();
-
   m_filtername = new char[32];
   strcpy( m_filtername, "none" );
 
@@ -84,7 +81,6 @@ mgMainMenu::mgMainMenu()
 
   m_filter     = 0;
 
-  m_current_playlist = m_media->createTemporaryPlaylist();
   m_tracklist = NULL;
 
   DisplayTree( m_root );
@@ -582,6 +578,9 @@ void mgMainMenu::DisplayFilterSelector()
 /************************************************************
  *
  * $Log: vdr_menu.c,v $
+ * Revision 1.8  2004/02/03 19:28:46  LarsAC
+ * Playlist now created in plugin instead of in menu.
+ *
  * Revision 1.7  2004/02/03 19:15:08  LarsAC
  * OSD selection now jumps back to parent when collapsing.
  *
diff --git a/muggle-plugin/vdr_menu.h b/muggle-plugin/vdr_menu.h
index a9cfae2..1b318c0 100644
--- a/muggle-plugin/vdr_menu.h
+++ b/muggle-plugin/vdr_menu.h
@@ -2,12 +2,12 @@
 /*! \file   vdr_menu.h
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.6 $
- * \date    $Date: 2004/02/03 19:15:08 $
+ * \version $Revision: 1.7 $
+ * \date    $Date: 2004/02/03 19:28:46 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  *
- * $Id: vdr_menu.h,v 1.6 2004/02/03 19:15:08 LarsAC Exp $
+ * $Id: vdr_menu.h,v 1.7 2004/02/03 19:28:46 LarsAC Exp $
  *
  */
 /*******************************************************************/
@@ -51,7 +51,7 @@ class mgMainMenu : public cOsdMenu
 {
  public:
   
-  mgMainMenu();
+  mgMainMenu(mgMedia *media, mgSelectionTreeNode *root, mgPlaylist *playlist);
 
   mgSelectionTreeNode *CurrentNode();
   mgMenuTreeItem *CurrentItem();
@@ -104,6 +104,9 @@ class mgMainMenu : public cOsdMenu
 /************************************************************
  *
  * $Log: vdr_menu.h,v $
+ * Revision 1.7  2004/02/03 19:28:46  LarsAC
+ * Playlist now created in plugin instead of in menu.
+ *
  * Revision 1.6  2004/02/03 19:15:08  LarsAC
  * OSD selection now jumps back to parent when collapsing.
  *