vlc | branch: master | Thomas Guillem <[email protected]> | Tue Mar 24 16:31:21 2015 +0000| [1e9e0e3cb9cf2a72019e83567b9940b786ae2f2f] | committer: Jean-Baptiste Kempf
input: drop ITEM_TYPE_CDDA Since it's not used anymore. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e9e0e3cb9cf2a72019e83567b9940b786ae2f2f --- 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(-) diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h index 27398cc..36db7b3 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 f5213ee..0fe4348 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 40465a2..3c4c67f 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 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 e5972a9..20954cd 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 226b14b..eaaaa7c 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 }, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
