* all: renamed PngBitmap into FileBitmap, as any image format

 can be loaded

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index 530acf061ca0895fa308c3a1742bd3121a0bbbd2..bea52b80348134b0eebd45f0c415fde994e43184 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -95,6 +95,8 @@ SOURCES_skins2 = \
        src/bitmap_font.hpp \
        src/dialogs.cpp \
        src/dialogs.hpp \
+       src/file_bitmap.cpp \
+       src/file_bitmap.hpp \
        src/ft2_bitmap.cpp \
        src/ft2_bitmap.hpp \
        src/ft2_font.cpp \
@@ -115,8 +117,6 @@ SOURCES_skins2 = \
        src/os_timer.hpp \
        src/os_window.hpp \
        src/os_tooltip.hpp \
-       src/png_bitmap.cpp \
-       src/png_bitmap.hpp \
        src/scaled_bitmap.cpp \
        src/scaled_bitmap.hpp \
        src/skin_main.cpp \

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index d0ec71ad34ca4a4c788799672ccbcea4627babf3..d2cf34c67dd3910823cc2a93602b5711fae4d7d0 100644 (file)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -26,7 +26,7 @@
 #include "builder.hpp"
 #include "builder_data.hpp"
 #include "interpreter.hpp"
-#include "../src/png_bitmap.hpp"
+#include "../src/file_bitmap.hpp"
 #include "../src/os_factory.hpp"
 #include "../src/generic_bitmap.hpp"
 #include "../src/top_window.hpp"
@@ -143,8 +143,8 @@ void Builder::addTheme( const BuilderData::Theme &rData )
 void Builder::addBitmap( const BuilderData::Bitmap &rData )
 {
     GenericBitmap *pBmp =
-        new PngBitmap( getIntf(), m_pImageHandler,
-                       rData.m_fileName, rData.m_alphaColor );
+        new FileBitmap( getIntf(), m_pImageHandler,
+                        rData.m_fileName, rData.m_alphaColor );
     m_pTheme->m_bitmaps[rData.m_id] = GenericBitmapPtr( pBmp );
 }
 
@@ -152,7 +152,7 @@ void Builder::addBitmap( const BuilderData::Bitmap &rData )
 void Builder::addBitmapFont( const BuilderData::BitmapFont &rData )
 {
     GenericBitmap *pBmp =
-        new PngBitmap( getIntf(), m_pImageHandler, rData.m_file, 0 );
+        new FileBitmap( getIntf(), m_pImageHandler, rData.m_file, 0 );
     m_pTheme->m_bitmaps[rData.m_id] = GenericBitmapPtr( pBmp );
 
     GenericFont *pFont = new BitmapFont( getIntf(), *pBmp, rData.m_type );

diff --git a/modules/gui/skins2/src/png_bitmap.cpp b/modules/gui/skins2/src/file_bitmap.cpp
similarity index 88%
rename from modules/gui/skins2/src/png_bitmap.cpp
rename to modules/gui/skins2/src/file_bitmap.cpp
index c8134a126137285cca4f489d7c5cb16f628c0f6a..b831b4c51e80adebf65ea334f80610c03f910cc7 100644 (file)
--- a/modules/gui/skins2/src/png_bitmap.cpp
+++ b/modules/gui/skins2/src/file_bitmap.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * png_bitmap.cpp
+ * file_bitmap.cpp
  *****************************************************************************
  * Copyright (C) 2003 the VideoLAN team
  * $Id$
@@ -24,10 +24,10 @@
 
 #include <vlc/vlc.h>
 #include "vlc_image.h"
-#include "png_bitmap.hpp"
+#include "file_bitmap.hpp"
 
-PngBitmap::PngBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
-                      string fileName, uint32_t aColor ):
+FileBitmap::FileBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
+                        string fileName, uint32_t aColor ):
     GenericBitmap( pIntf ), m_width( 0 ), m_height( 0 )
 {
     video_format_t fmt_in = {0}, fmt_out = {0};
@@ -76,17 +76,17 @@ PngBitmap::PngBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
 }
 
 
-PngBitmap::~PngBitmap()
+FileBitmap::~FileBitmap()
 {
     if( m_pData ) delete[] m_pData;
 }
 
 
-uint8_t *PngBitmap::getData() const
+uint8_t *FileBitmap::getData() const
 {
     if( m_pData == NULL )
     {
-        msg_Warn( getIntf(), "PngBitmap::getData() returns NULL" );
+        msg_Warn( getIntf(), "FileBitmap::getData() returns NULL" );
     }
     return m_pData;
 }

diff --git a/modules/gui/skins2/src/png_bitmap.hpp b/modules/gui/skins2/src/file_bitmap.hpp
similarity index 82%
rename from modules/gui/skins2/src/png_bitmap.hpp
rename to modules/gui/skins2/src/file_bitmap.hpp
index fd58ee4df59b0abb271b9b1b249793d30a8be423..a26721c5790afa7d3fa5a494d8e99a3b246b13ad 100644 (file)
--- a/modules/gui/skins2/src/png_bitmap.hpp
+++ b/modules/gui/skins2/src/file_bitmap.hpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * png_bitmap.hpp
+ * file_bitmap.hpp
  *****************************************************************************
  * Copyright (C) 2003 the VideoLAN team
  * $Id$
@@ -22,23 +22,23 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef PNG_BITMAP_HPP
-#define PNG_BITMAP_HPP
+#ifndef FILE_BITMAP_HPP
+#define FILE_BITMAP_HPP
 
 #include "generic_bitmap.hpp"
 #include <string>
 
 
-/// Class for PNG bitmaps
-class PngBitmap: public GenericBitmap
+/// Class for file bitmaps
+class FileBitmap: public GenericBitmap
 {
     public:
-        /// Load a PNG bitmap from a file. aColor is the transparency
+        /// Load a bitmap from a file. aColor is the transparency
         /// color, in the format 0xRRGGBB
-        PngBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
-                   string fileName, uint32_t aColor );
+        FileBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
+                    string fileName, uint32_t aColor );
 
-        virtual ~PngBitmap();
+        virtual ~FileBitmap();
 
         /// Get the width of the bitmap
         virtual int getWidth() const { return m_width; }