Merged player branch back on HEAD branch.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/muggle-plugin/mg_database.c b/muggle-plugin/mg_database.c
index 9a85cb8..eabff6d 100644
--- a/muggle-plugin/mg_database.c
+++ b/muggle-plugin/mg_database.c
@@ -2,10 +2,10 @@
 /*! \file   mg_database.c
  *  \brief  A capsule around MySql database access
  ******************************************************************** 
- * \version $Revision: 1.1 $
- * \date    $Date: 2004/02/01 18:22:53 $
+ * \version $Revision: 1.2 $
+ * \date    $Date: 2004/05/28 15:29:18 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
- * \author  file owner: $Author: LarsAC $
+ * \author  file owner: $Author: lvw $
  */
 /*******************************************************************/
 
@@ -17,7 +17,9 @@ mgDB::mgDB()
 {
 }
 
-mgDB::mgDB(string user, string pass) 
+mgDB::mgDB(string host, string name, 
+	   string user, string pass,
+	   int port) 
 {
 }
 
@@ -27,9 +29,8 @@ mgDB::~mgDB()
 
 MYSQL mgDB::getDBHandle()
 {
-  MYSQL m;
 
-  return m;
+  return m_dbase;
 }