[vlc-devel] [PATCH] demux: mkv: fix inability to build with MKV_DEBUG after f87c441 + a6fde34 (variable renaming)
Filip Roséen
filip at atch.se
Tue Jul 17 12:58:07 CEST 2018
f87c441 + a6fde34 did not do a very good job at replacing variable
names (resulting in an inability to enable MKV_DEBUG) as the variables
referenced has new names.
---
modules/demux/mkv/virtual_segment.cpp | 12 ++++++------
modules/demux/mkv/virtual_segment.hpp | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index 47c0d50d08..af30a537c2 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -209,9 +209,9 @@ virtual_edition_c::virtual_edition_c( chapter_edition_c * p_edit, matroska_segme
}
#ifdef MKV_DEBUG
- msg_Dbg( &p_main_segment.sys.demuxer, "-- RECAP-BEGIN --" );
+ msg_Dbg( &main_segment.sys.demuxer, "-- RECAP-BEGIN --" );
print();
- msg_Dbg( &p_main_segment.sys.demuxer, "-- RECAP-END --" );
+ msg_Dbg( &main_segment.sys.demuxer, "-- RECAP-END --" );
#endif
}
@@ -687,10 +687,10 @@ bool virtual_chapter_c::Leave( bool b_do_subs )
#ifdef MKV_DEBUG
void virtual_chapter_c::print()
{
- msg_Dbg( &p_segment->sys.demuxer, "*** chapter %" PRId64 " - %" PRId64 " (%u)",
- i_mk_virtual_start_time, i_mk_virtual_stop_time, sub_chapters.size() );
- for( size_t i = 0; i < sub_chapters.size(); i++ )
- sub_chapters[i]->print();
+ msg_Dbg( &segment.sys.demuxer, "*** chapter %" PRId64 " - %" PRId64 " (%u)",
+ i_mk_virtual_start_time, i_mk_virtual_stop_time, sub_vchapters.size() );
+ for( size_t i = 0; i < sub_vchapters.size(); i++ )
+ sub_vchapters[i]->print();
}
#endif
diff --git a/modules/demux/mkv/virtual_segment.hpp b/modules/demux/mkv/virtual_segment.hpp
index d09913b689..45086bcd65 100644
--- a/modules/demux/mkv/virtual_segment.hpp
+++ b/modules/demux/mkv/virtual_segment.hpp
@@ -108,7 +108,7 @@ private:
void retimeChapters();
void retimeSubChapters( virtual_chapter_c * p_vchap );
#ifdef MKV_DEBUG
- void print(){ for( size_t i = 0; i<chapters.size(); i++ ) chapters[i]->print(); }
+ void print(){ for( size_t i = 0; i<vchapters.size(); i++ ) vchapters[i]->print(); }
#endif
};
--
2.18.0
More information about the vlc-devel
mailing list