Merged most recent stuff from osd_extensions trunk for next release (0.1.2)

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

1 files changed, 4 insertions, 5 deletions

diff --git a/muggle-plugin/vdr_decoder_flac.c b/muggle-plugin/vdr_decoder_flac.c
index c640205..f18ceab 100644
--- a/muggle-plugin/vdr_decoder_flac.c
+++ b/muggle-plugin/vdr_decoder_flac.c
@@ -34,8 +34,7 @@ mgFlacDecoder::mgFlacDecoder( mgContentItem *item )
 {
   mgLog lg( "mgFlacDecoder::mgFlacDecoder" );
 
-  m_filename = the_setup.getFilename( item->getSourceFile () );
-  //   m_filename = item->getSourceFile();
+  m_filename = item->getSourceFile();
   m_pcm = 0;
   m_reservoir = 0;
 
@@ -100,10 +99,10 @@ bool mgFlacDecoder::clean()
   
   if( m_reservoir )
     {
-      delete m_reservoir[0];
-      delete m_reservoir[1];
+      delete[] m_reservoir[0];
+      delete[] m_reservoir[1];
     }
-  delete m_reservoir;
+  delete[] m_reservoir;
   
   // why false? true?
   return true;