From 11e13526892959b9907c35b8213ea2e1cd2665cf Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 4 Nov 2008 18:09:18 +0000
Subject: [PATCH] Clarified how mkvmerge interprets timecodes given for the
 --split option.

---
 doc/mkvmerge-gui.html  | 20 +++++++++++++++-----
 doc/mkvmerge.1         |  2 +-
 src/mmg/tab_global.cpp | 24 +++++++++---------------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/doc/mkvmerge-gui.html b/doc/mkvmerge-gui.html
index b7b0793de..de8124eaf 100644
--- a/doc/mkvmerge-gui.html
+++ b/doc/mkvmerge-gui.html
@@ -592,7 +592,7 @@
 
   <p><code>File/segment title:</code> This title is used for the actual
    movie title, e.g. 'Vanilla Sky'.</p>
-  
+
   <h4><a name="global_split">3.5.2. Automatic splitting and file
     linking </a></h4>
 
@@ -601,7 +601,7 @@
    big file is generated. If splitting is activated then you can tell
    <i>mkvmerge</i> to start a new output file after either a specific
    amount of data has been written to the current file or after a specific
-   amount of time has accumulated. The formats accepted are:
+   timecode has been reached. The accepted formats are:
    <br>
    <ul>
     <li>For the size: A number optionally followed by the letter 'K', 'M'
@@ -609,9 +609,19 @@
      bytes) or gigabytes (1024 * 1024 * 1024 bytes). Examples: '700M' or
      '100000K'.</li>
 
-    <li>For the time: The format is either <code>HH:MM:SS</code> or a
-     number followed by the letter 's' indicating a number of
-     seconds. Examples: '01:20:00' (split after 1 hour, 20 minutes) or
+    <li>For the time: The format is either <code>HH:MM:SS.nnn</code>
+     with up to nine digits for up to nanosecond precision or a number
+     followed by the letter 's' indicating a number of
+     seconds. Several timecodes can be entered separated by
+     commas.<br>
+
+     Please note that the timecodes refer to the unsplit output
+     stream. Therefore entering '00:10:00,00:20:00' will result in
+     three files of which the first two will be roughly ten minutes
+     long. The third piece will contain the rest of the input
+     stream. This is independant of the 'file linking' feature.<br>
+
+     Examples: '01:20:00' (split after 1 hour, 20 minutes) or
      '1800s' (split after 1800 seconds = 30 minutes).</li>
    </ul>
   </p>
diff --git a/doc/mkvmerge.1 b/doc/mkvmerge.1
index b3f8865d1..264c98d93 100644
--- a/doc/mkvmerge.1
+++ b/doc/mkvmerge.1
@@ -178,7 +178,7 @@ The \fBduration:\fR prefix may be omitted for compatibility reasons.
 The parameters \fIA\fR, \fIB\fR etc must all have the same format as the ones
 used for the duration (see above).
 The list of timecodes is separated by commas.
-After the current file has reached the current split point's timecode a new
+After the input stream has reached the current split point's timecode a new
 file is created.
 Then the next split point given in this list is used.
 The \fRtimecodes:\fR prefix must not be omitted.
diff --git a/src/mmg/tab_global.cpp b/src/mmg/tab_global.cpp
index 9fb720636..5e1909038 100644
--- a/src/mmg/tab_global.cpp
+++ b/src/mmg/tab_global.cpp
@@ -128,21 +128,15 @@ tab_global::tab_global(wxWindow *parent):
   tc_split_after_timecodes = new wxTextCtrl(this, ID_TC_SPLITAFTERTIMECODES,
                                       wxT(""));
   tc_split_after_timecodes->
-    SetToolTip(TIP("The timecodes after which a new output "
-                   "file is started. The timecodes can be given "
-                   "either in the form HH:MM:SS.nnnnnnnnn "
-                   "or as the number of seconds followed by "
-                   "'s'. You may omit the number of hours "
-                   "'HH' and the number of nanoseconds "
-                   "'nnnnnnnnn'. If given then you may use "
-                   "up to nine digits after the decimal "
-                   "point. If two or more "
-                   "timecodes are used then you have to separate them with "
-                   "commas. The formats can be mixed, too. "
-                   "Examples: 01:00:00,01:30:00 (after one hour and after "
-                   "one hour and thirty minutes) or "
-                   "1800s,3000s,00:10:00 (after three, five and ten "
-                   "minutes)."));
+    SetToolTip(TIP("The timecodes after which a new output file is started. "
+                   "The timecodes refer to the whole stream and not to each individual output file. "
+                   "The timecodes can be given either in the form HH:MM:SS.nnnnnnnnn or as the number of seconds followed by 's'. "
+                   "You may omit the number of hours 'HH'. "
+                   "You can specify up to nine digits for the number of nanoseconds 'nnnnnnnnn' or none at all. "
+                   "If given then you may use up to nine digits after the decimal point. "
+                   "If two or more timecodes are used then you have to separate them with commas. "
+                   "The formats can be mixed, too. "
+                   "Examples: 01:00:00,01:30:00 (after one hour and after one hour and thirty minutes) or 1800s,3000s,00:10:00 (after three, five and ten minutes)."));
   tc_split_after_timecodes->Enable(false);
   siz_line2->Add(tc_split_after_timecodes, 1,
                  wxALIGN_CENTER_VERTICAL | wxGROW, 5);