Fixed bug that the recordings items were not deleted when the tree was

rebuild. This was because of the non weak references to the parent
items.
Deleting of recordings can be triggered now. It still needs some
tweaking on the visual feedback. And possibly a 'undelete' option for
the last deleted recording.

1 files changed, 9 insertions, 2 deletions

diff --git a/recman.h b/recman.h
index 0f8b8c5..45265b3 100644
--- a/recman.h
+++ b/recman.h
@@ -25,7 +25,7 @@ namespace vdrlive {
 
 	typedef std::tr1::shared_ptr< RecordingsManager > RecordingsManagerPtr;
 	typedef std::tr1::shared_ptr< RecordingsItem > RecordingsItemPtr;
-	// typedef std::tr1::weak_ptr< RecordingsItem > RecordingsItemWeakPtr;
+	typedef std::tr1::weak_ptr< RecordingsItem > RecordingsItemWeakPtr;
 	typedef std::multimap< std::string, RecordingsItemPtr > RecordingsMap;
 
 
@@ -69,6 +69,12 @@ namespace vdrlive {
 			cRecording const* GetByMd5Hash(std::string const & hash) const;
 
 			/**
+			 *  Delete a recording with the given hash according to
+			 *  VDRs recording deletion mechanisms.
+			 */
+			void DeleteRecording(cRecording const * recording) const;
+
+			/**
 			 *	Determine wether the recording has been archived on
 			 *	removable media (e.g. DVD-ROM)
 			 */
@@ -127,7 +133,7 @@ namespace vdrlive {
 		private:
 			std::string m_name;
 			RecordingsMap m_entries;
-			RecordingsItemPtr m_parent;
+			RecordingsItemWeakPtr m_parent;
 	};
 
 
@@ -217,6 +223,7 @@ namespace vdrlive {
 			RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsTree > recTree);
 
 		public:
+			RecordingsTreePtr();
 			virtual ~RecordingsTreePtr();
 
 		private: