input: drop ITEM_TYPE_CDDA

Since it's not used anymore.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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,

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 \

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" );

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>

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 },