From 1e9e0e3cb9cf2a72019e83567b9940b786ae2f2f Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 24 Mar 2015 16:31:21 +0000
Subject: [PATCH] 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                          |   1 -
 modules/gui/qt4/Makefile.am                       |   1 -
 modules/gui/qt4/components/playlist/vlc_model.cpp |   1 -
 modules/gui/qt4/pixmaps/types/cdda_16px.png       | Bin 528 -> 0 bytes
 modules/gui/qt4/vlc.qrc                           |   1 -
 src/input/item.c                                  |   2 +-
 6 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 modules/gui/qt4/pixmaps/types/cdda_16px.png

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index 27398cc52a..36db7b32ae 100644
--- 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 f5213eec09..0fe4348363 100644
--- 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 40465a2d4a..3c4c67f00c 100644
--- 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
index cc14f92c11c8600fb8c47633ebda27844b98ac49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005kNkl<ZI1#nM
z%}>&C9Ki9<=D*O1*4^sXJoImL%2Ox%2U@3cbg9^~t%t3x)uA~&Fj=8llVTc_3?-?7
z7$~5KJVX@Y!;gpG!}p!2IAyD~TCbP<3%lKp{0*nmiHOkC(}Q%InukC{BbnJ`=3^QE
zYz;XM5n*6p0GG>!bgXVc%YtmlVEjXahR&hXN|h`2No3cV)4j+6pU;PMtd-fLu$Ye2
zDSS6M>gx}ktAnH5x_JXR;PrZuws?_aDpi9_!Jth68{3KpZjH%z>kMAIj>F+VM6lUx
zNLw@y$+afBt^frn7PAH$wHAg2qkf&S5UkYT&d@zZMxN2%e-Y`37T`@-BNT6vub6CV
z5YJcy=E}UBE|Vz2`MzF6grU3lk!}lla8GaJ3)cxJn|xX_c^x#7U7lA7GDSFb@&tY7
z&hj}8((Qc`yt6yFr*`np)rqDJmU9Zv+Z^G@I!yzXOAt)LVi7J~eu#9NS%9bGTa3+U
zDB2WXG8$T4XP+YX%_Lod3;nl|ZvG{h2<kKquq^iICKM|cN2M}V<X6He_9=z3prtE9
z@dlQq=y>!bfc#D<!6602R!q_b_IM^@$e(x~fKUulS)Igco#7X09uLnW|HDrMDfcf?
S$p)JM0000<MNUMnLSTXdKlE$>

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index e5972a928e..20954cd539 100644
--- 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 226b14bf9c..eaaaa7c81c 100644
--- 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 },
-- 
2.39.2