From 21ea80f75180539fea1934516bfbc544742ab2a2 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 1 Nov 2005 21:26:07 +0000
Subject: [PATCH] Convert the format used in wxString::Format() first because
 it might be redefined on Windows (%lld vs %I64d). This bug was introduced in
 commit 3121. Fixes Anthill bug #160.

---
 ChangeLog             | 6 ++++++
 src/mmg/mmg.cpp       | 8 ++++++--
 src/mmg/tab_input.cpp | 6 ++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70c39a308..8100912cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-01  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mmg: bug fix: Appending tracks was broken because the track
+	numbers in the command line were incorrect. Fixes Anthill bug
+	#160.
+
 2005-10-23  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: new feature: Added support for Ogg/Theora.
diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp
index c33e8c850..d353b1f45 100644
--- a/src/mmg/mmg.cpp
+++ b/src/mmg/mmg.cpp
@@ -549,8 +549,10 @@ wxString
 create_track_order(bool all) {
   int i;
   wxString s, format;
+  string temp;
 
-  format = wxT("%d:" LLD);
+  fix_format("%d:" LLD, temp);
+  format = wxU(temp.c_str());
   for (i = 0; i < tracks.size(); i++) {
     if (!all && (!tracks[i]->enabled || tracks[i]->appending))
       continue;
@@ -566,8 +568,10 @@ wxString
 create_append_mapping() {
   int i;
   wxString s, format;
+  string temp;
 
-  format = wxT("%d:" LLD ":%d:" LLD);
+  fix_format("%d:" LLD ":%d:" LLD, temp);
+  format = wxU(temp.c_str());
   for (i = 1; i < tracks.size(); i++) {
     if (!tracks[i]->enabled || !tracks[i]->appending)
       continue;
diff --git a/src/mmg/tab_input.cpp b/src/mmg/tab_input.cpp
index a82147b3c..f4cb7ddd8 100644
--- a/src/mmg/tab_input.cpp
+++ b/src/mmg/tab_input.cpp
@@ -900,8 +900,10 @@ tab_input::add_file(const wxString &file_name,
             dims = split(pair[1], wxU("x"));
             if ((dims.size() == 2) && parse_int(wxMB(dims[0]), width) &&
                 parse_int(wxMB(dims[1]), height)) {
-              track->dwidth.Printf(wxT(LLD), width);
-              track->dheight.Printf(wxT(LLD), height);
+              string format;
+              fix_format(LLD, format);
+              track->dwidth.Printf(wxU(format.c_str()), width);
+              track->dheight.Printf(wxU(format.c_str()), height);
               track->display_dimensions_selected = true;
             }