From 001751f2d9ec3e13f5c4c36e8361ce1e4db43871 Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Sun, 5 May 2013 18:04:13 +0200
Subject: Fixed segfault in vdrProvider

---
 include/media/mediaManager.h | 5 -----
 include/server.h             | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/media/mediaManager.h b/include/media/mediaManager.h
index 10cb9e9..36987ab 100644
--- a/include/media/mediaManager.h
+++ b/include/media/mediaManager.h
@@ -14,8 +14,6 @@
 #include <list>
 #include <string>
 #include <stdint.h>
-#include <tntdb/connect.h>
-#include <tntdb/connection.h>
 
 namespace upnp {
 
@@ -57,8 +55,6 @@ public:
   cMediaManager();
   virtual ~cMediaManager();
 
-  void SetDatabaseDir(const string& file);
-
   bool Initialise();
   void Housekeeping();
 
@@ -94,7 +90,6 @@ private:
   uint32_t          systemUpdateID;
   IdList            eventedContainerUpdateIDs;
   StringList        scanTargets;
-  string            databaseFile;
   tntdb::Connection connection;
 
   upnp::cPluginManager* pluginManager;
diff --git a/include/server.h b/include/server.h
index 6f52a1f..10be258 100644
--- a/include/server.h
+++ b/include/server.h
@@ -12,6 +12,8 @@
 #include <map>
 #include <list>
 #include <upnp/upnp.h>
+#include <tntdb/connect.h>
+#include <tntdb/connection.h>
 #include "../include/config.h"
 
 using namespace std;
@@ -67,6 +69,7 @@ public:
 
   const cWebserver& GetWebserver() const { return *mWebserver; }
   cMediaManager& GetManager() const { return *mMediaManager; }
+  tntdb::Connection& GetDatabase() const { return mConnection; }
 
   const string GetDeviceUUID() const { return string("uuid:") + mCurrentConfiguration.deviceUUID; }
 
@@ -94,6 +97,7 @@ private:
 	Description         mServerDescription;
 	iconList            mServerIcons;
 	upnp::cConfig       mCurrentConfiguration;
+  tntdb::Connection   mConnection;
 	string              mConfigDirectory;
 	UpnpDevice_Handle   mDeviceHandle;
 	int                 mAnnounceMaxAge;
-- 
cgit v1.2.3