<html><head></head><body lang="en-US" style="background-color: rgb(255, 255, 255); line-height: initial;">                                                                                      <div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);">Because upcoming patches are a complete/extensive rewrite of the relevant parts.</div><div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);"><br></div><div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);">In order to still be able to compile the relevant patches, while still maintaining readability - I choose the observed method.</div><div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);"><br></div><div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);">It is less about the history per-say and more about making it easier to follow the work of this patch-batch when only looking at the diffs.<br><br>Since one removal of a variable changes a lot of things, commenting and the replacing those comments should be of greater aid than trying to track changes in-between the commits.‎</div>                                                                                                                                     <div style="width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; color: rgb(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);"><span style="font-family: Calibri, 'Slate Pro', sans-serif, sans-serif; font-size: initial; text-align: initial; line-height: initial;"><br></span></div>                                                                                                                                                                                  <table width="100%" style="background-color:white;border-spacing:0px;"> <tbody><tr><td colspan="2" style="font-size: initial; text-align: initial; background-color: rgb(255, 255, 255);">                           <div style="border-style: solid none none; border-top-color: rgb(181, 196, 223); border-top-width: 1pt; padding: 3pt 0in 0in; font-family: Tahoma, 'BB Alpha Sans', 'Slate Pro'; font-size: 10pt;">  <div><b>From: </b>Filipe Cabecinhas</div><div><b>Sent: </b>Tuesday, May 10, 2016 9:32 AM</div><div><b>To: </b>Mailing list for VLC media player developers</div><div><b>Reply To: </b>Mailing list for VLC media player developers</div><div><b>Subject: </b>Re: [vlc-devel] [PATCH 02/30] mkv: removed unnecessary data-member i_start_pos from matroska_segment_c</div></div></td></tr></tbody></table><div style="border-style: solid none none; border-top-color: rgb(186, 188, 209); border-top-width: 1pt; font-size: initial; text-align: initial; background-color: rgb(255, 255, 255);"></div><br><div id="_originalContent" style="">Why keep references to i_start_pos in comments?<div>That should just be referenced from the patch in git if someone needs to track this history.</div><div><br></div><div>Thank you,</div><div><br></div><div>  Filipe<span></span><br><br>On Monday, 9 May 2016, Filip Roséen <<a href="mailto:filip@videolabs.io">filip@videolabs.io</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This variable is of no real aid, as such it has been removed to favor<br>
readability. The less fuzz around what we actually need, the better.<br>
---<br>
 modules/demux/mkv/matroska_segment.cpp | 9 ++++-----<br>
 modules/demux/mkv/matroska_segment.hpp | 1 -<br>
 2 files changed, 4 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp<br>
index 1d02fb7..5ccb30f 100644<br>
--- a/modules/demux/mkv/matroska_segment.cpp<br>
+++ b/modules/demux/mkv/matroska_segment.cpp<br>
@@ -47,7 +47,6 @@ matroska_segment_c::matroska_segment_c( demux_sys_t & demuxer, EbmlStream & estr<br>
     ,cluster(NULL)<br>
     ,i_block_pos(0)<br>
     ,i_cluster_pos(0)<br>
-    ,i_start_pos(0)<br>
     ,p_segment_uid(NULL)<br>
     ,p_prev_segment_uid(NULL)<br>
     ,p_next_segment_uid(NULL)<br>
@@ -584,7 +583,7 @@ bool matroska_segment_c::Preload( )<br>
<br>
             cluster = kc_ptr;<br>
<br>
-            i_cluster_pos = i_start_pos = cluster->GetElementPosition();<br>
+            i_cluster_pos = cluster->GetElementPosition();<br>
             ParseCluster( cluster );<br>
<br>
             ep->Down();<br>
@@ -762,7 +761,7 @@ void matroska_segment_c::Seek( mtime_t i_mk_date, mtime_t i_mk_time_offset )<br>
     KaxSimpleBlock *simpleblock;<br>
     int64_t     i_block_duration;<br>
     size_t      i_track;<br>
-    int64_t     i_seek_position = i_start_pos;<br>
+    int64_t     i_seek_position = 0; // previously i_start_pos<br>
     mtime_t     i_mk_seek_time = i_mk_start_time;<br>
     mtime_t     i_mk_pts = 0;<br>
     int i_cat;<br>
@@ -776,7 +775,7 @@ void matroska_segment_c::Seek( mtime_t i_mk_date, mtime_t i_mk_time_offset )<br>
     {<br>
         es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME,<br>
                         INT64_C(0) );<br>
-        es.I_O().setFilePointer( i_start_pos );<br>
+        es.I_O().setFilePointer( 0 /* previously i_start_pos */ );<br>
<br>
         ep->reconstruct( &es, segment, &sys.demuxer );<br>
<br>
@@ -1137,7 +1136,7 @@ bool matroska_segment_c::Select( mtime_t i_mk_start_time )<br>
<br>
     sys.i_start_pts = i_mk_start_time + VLC_TS_0;<br>
     // reset the stream reading to the first cluster of the segment used<br>
-    es.I_O().setFilePointer( i_start_pos );<br>
+    es.I_O().setFilePointer( 0 /* previously i_start_pos */ );<br>
<br>
     ep->reconstruct( &es, segment, &sys.demuxer );<br>
<br>
diff --git a/modules/demux/mkv/matroska_segment.hpp b/modules/demux/mkv/matroska_segment.hpp<br>
index e86c1af..8b9d569 100644<br>
--- a/modules/demux/mkv/matroska_segment.hpp<br>
+++ b/modules/demux/mkv/matroska_segment.hpp<br>
@@ -102,7 +102,6 @@ public:<br>
     KaxCluster              *cluster;<br>
     uint64                  i_block_pos;<br>
     uint64                  i_cluster_pos;<br>
-    int64_t                 i_start_pos;<br>
     KaxSegmentUID           *p_segment_uid;<br>
     KaxPrevUID              *p_prev_segment_uid;<br>
     KaxNextUID              *p_next_segment_uid;<br>
--<br>
2.8.2<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
</blockquote></div>
<br><!--end of _originalContent --></div></body></html>