input: drop ITEM_TYPE_CDDA

Since it's not used anymore.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index 27398cc52aa053b8cb813eaf0a7764b22983ad64..36db7b32ae26280c7ee27e3c6a1896c0486c894f 100644 (file)
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -101,7 +101,6 @@ enum input_item_type_e
     ITEM_TYPE_FILE,
     ITEM_TYPE_DIRECTORY,
     ITEM_TYPE_DISC,
-    ITEM_TYPE_CDDA,
     ITEM_TYPE_CARD,
     ITEM_TYPE_STREAM,
     ITEM_TYPE_PLAYLIST,

diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
index f5213eec09f9d4010a1e0586e34d042fff7a4554..0fe434836314e4a9d2bf12be57801c9d03a2f5fe 100644 (file)
--- a/modules/gui/qt4/Makefile.am
+++ b/modules/gui/qt4/Makefile.am
@@ -384,7 +384,6 @@ DEPS_res = \
        pixmaps/toolbar/volume-slider-inside.png \
        pixmaps/toolbar/volume-slider-outside.png \
        pixmaps/types/capture-card_16px.png \
-       pixmaps/types/cdda_16px.png \
        pixmaps/types/disc_16px.png \
        pixmaps/types/file-asym_16px.png \
        pixmaps/types/file-wide_16px.png \

diff --git a/modules/gui/qt4/components/playlist/vlc_model.cpp b/modules/gui/qt4/components/playlist/vlc_model.cpp
index 40465a2d4a9607433e818bd2f873677a3f9ad129..3c4c67f00c095e870052ad5bcb782795f6066064 100644 (file)
--- a/modules/gui/qt4/components/playlist/vlc_model.cpp
+++ b/modules/gui/qt4/components/playlist/vlc_model.cpp
@@ -55,7 +55,6 @@ VLCModel::VLCModel( intf_thread_t *_p_intf, QObject *parent )
     ADD_ICON( FILE, ":/type/file" );
     ADD_ICON( DIRECTORY, ":/type/directory" );
     ADD_ICON( DISC, ":/type/disc" );
-    ADD_ICON( CDDA, ":/type/cdda" );
     ADD_ICON( CARD, ":/type/capture-card" );
     ADD_ICON( STREAM, ":/type/stream" );
     ADD_ICON( PLAYLIST, ":/type/playlist" );

diff --git a/modules/gui/qt4/pixmaps/types/cdda_16px.png b/modules/gui/qt4/pixmaps/types/cdda_16px.png
deleted file mode 100644 (file)
index cc14f92..0000000
Binary files a/modules/gui/qt4/pixmaps/types/cdda_16px.png and /dev/null differ

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index e5972a928e6d6fdf345a152e951567d56088ecaa..20954cd5394759d89fe5d8961e0ef854c83b2327 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -79,7 +79,6 @@
     </qresource>
     <qresource prefix="/type">
         <file alias="capture-card">pixmaps/types/capture-card_16px.png</file>
-        <file alias="cdda">pixmaps/types/cdda_16px.png</file>
         <file alias="disc">pixmaps/types/disc_16px.png</file>
         <file alias="file-asym">pixmaps/types/file-asym_16px.png</file>
         <file alias="file-wide">pixmaps/types/file-wide_16px.png</file>

diff --git a/src/input/item.c b/src/input/item.c
index 226b14bf9ceaa02596e0082d886e6e43089dbaf4..eaaaa7c81c9d43bb889e7b676163794eef16adfe 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -971,7 +971,7 @@ static int GuessType( const input_item_t *p_item, bool *p_net )
         { "atsc",   ITEM_TYPE_CARD, false },
         { "bd",     ITEM_TYPE_DISC, false },
         { "cable",  ITEM_TYPE_CARD, false },
-        { "cdda",   ITEM_TYPE_CDDA, false },
+        { "cdda",   ITEM_TYPE_DISC, false },
         { "cqam",   ITEM_TYPE_CARD, false },
         { "dc1394", ITEM_TYPE_CARD, false },
         { "dccp",   ITEM_TYPE_STREAM, true },