skins2: implement a ArtManager singleton

[vlc] / modules / gui / skins2 / controls / ctrl_image.cpp

diff --git a/modules/gui/skins2/controls/ctrl_image.cpp b/modules/gui/skins2/controls/ctrl_image.cpp
index 3de4fc97ee4d515dead6df3dc69774e40249717a..c9c35ca6883203baeaede832471950eea7e4c4e3 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_image.cpp
+++ b/modules/gui/skins2/controls/ctrl_image.cpp
@@ -29,7 +29,7 @@
 #include "../src/os_graphics.hpp"
 #include "../src/vlcproc.hpp"
 #include "../src/scaled_bitmap.hpp"
-#include "../src/art_bitmap.hpp"
+#include "../src/art_manager.hpp"
 #include "../utils/position.hpp"
 
 
@@ -51,8 +51,6 @@ CtrlImage::CtrlImage( intf_thread_t *pIntf, GenericBitmap &rBitmap,
     {
         VlcProc *pVlcProc = VlcProc::instance( getIntf() );
         pVlcProc->getStreamArtVar().addObserver( this );
-
-        ArtBitmap::initArtBitmap( getIntf() );
     }
 
 }
@@ -66,8 +64,6 @@ CtrlImage::~CtrlImage()
     {
         VlcProc *pVlcProc = VlcProc::instance( getIntf() );
         pVlcProc->getStreamArtVar().delObserver( this );
-
-        ArtBitmap::freeArtBitmap( );
     }
 }
 
@@ -218,7 +214,8 @@ void CtrlImage::onUpdate( Subject<VarString> &rVariable, void* arg )
     if( &rVariable == &pVlcProc->getStreamArtVar() )
     {
         string str = ((VarString&)rVariable).get();
-        GenericBitmap* pArt = (GenericBitmap*) ArtBitmap::getArtBitmap( str );
+        ArtManager* pArtManager = ArtManager::instance( getIntf() );
+        GenericBitmap* pArt = (GenericBitmap*) pArtManager->getArtBitmap( str );
 
         m_pBitmap = pArt ? pArt : m_pOriginalBitmap;