vlc | branch: master | Filip Roséen <[email protected]> | Wed Jul 18 07:39:54 2018 +0200| [af891e65dbc2d815a3a41e85fe86a4e74f6142c2] | committer: Thomas Guillem
demux: mkv: remove no longer required code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af891e65dbc2d815a3a41e85fe86a4e74f6142c2 --- modules/demux/mkv/demux.cpp | 15 --------------- modules/demux/mkv/demux.hpp | 3 --- modules/demux/mkv/mkv.cpp | 2 -- 3 files changed, 20 deletions(-) diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp index ed5433f715..225bf00337 100644 --- a/modules/demux/mkv/demux.cpp +++ b/modules/demux/mkv/demux.cpp @@ -33,7 +33,6 @@ namespace mkv { demux_sys_t::~demux_sys_t() { - CleanUi(); size_t i; for ( i=0; i<streams.size(); i++ ) delete streams[i]; @@ -156,20 +155,6 @@ bool demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, matroska_stream_c * return true; } -void demux_sys_t::InitUi() -{ - msg_Dbg( &demuxer, "Starting the UI Hook" ); - - /* FIXME hack hack hack hack FIXME */ - /* Get p_input and create variable */ - p_input = demuxer.p_input; -} - -void demux_sys_t::CleanUi() -{ - msg_Dbg( &demuxer, "Stopping the UI Hook" ); -} - void demux_sys_t::PreloadFamily( const matroska_segment_c & of_segment ) { for (size_t i=0; i<opened_segments.size(); i++) diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp index ba0f6b6d89..0f4e4df571 100644 --- a/modules/demux/mkv/demux.hpp +++ b/modules/demux/mkv/demux.hpp @@ -106,9 +106,6 @@ public: bool AnalyseAllSegmentsFound( demux_t *p_demux, matroska_stream_c * ); void JumpTo( virtual_segment_c & vsegment, virtual_chapter_c & vchapter ); - void InitUi(); - void CleanUi(); - /* for spu variables */ input_thread_t *p_input; uint8_t palette[4][4]; diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index 2ddff0368e..415b9f5b51 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -252,8 +252,6 @@ static int Open( vlc_object_t * p_this ) p_sys->FreeUnused(); - p_sys->InitUi(); - return VLC_SUCCESS; error: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
