From dab5357986db70f5b182d1bec61a4cbd614412b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Stadler?= <mail@renestadler.de>
Date: Sun, 6 Nov 2011 12:41:08 +0100
Subject: [PATCH] Data: remove log line serialization

This is incomplete and prone to error. Move it out into the utility script
(which is the only user).
---
 debug-viewer/GstDebugViewer/Data.py   | 14 --------------
 debug-viewer/tests/create-test-log.py | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/debug-viewer/GstDebugViewer/Data.py b/debug-viewer/GstDebugViewer/Data.py
index 077aec062d..4b3b68d5f7 100644
--- a/debug-viewer/GstDebugViewer/Data.py
+++ b/debug-viewer/GstDebugViewer/Data.py
@@ -287,20 +287,6 @@ class LogLine (list):
 
         return line
 
-    def line_string (self, message = None):
-
-        # Replicates gstreamer/gst/gstinfo.c:gst_debug_log_default.
-
-        ts, pid, thread, level, category, filename, line, function, object_, message_offset = self
-
-        if isinstance (message_offset, str):
-            message = message_offset
-
-        # FIXME: Regarding object_, this doesn't fully replicate the formatting!
-        return "%s %5d 0x%x %s %20s %s:%d:%s:<%s> %s" % (time_args (ts), pid, thread, level.name.ljust (5),
-                                                         category, filename, line, function,
-                                                         object_, message,)
-
 class LogLines (object):
 
     def __init__ (self, fileobj, line_cache):
diff --git a/debug-viewer/tests/create-test-log.py b/debug-viewer/tests/create-test-log.py
index f4501617ba..be404dd5c0 100755
--- a/debug-viewer/tests/create-test-log.py
+++ b/debug-viewer/tests/create-test-log.py
@@ -1,11 +1,23 @@
 #!/usr/bin/env python
 
+def line_string (ts, pid, thread, level, category, filename, line, function,
+                 object_, message):
+
+    # Replicates gstreamer/gst/gstinfo.c:gst_debug_log_default.
+
+    # FIXME: Regarding object_, this doesn't fully replicate the formatting!
+    return "%s %5d 0x%x %s %20s %s:%d:%s:<%s> %s" % (Data.time_args (ts), pid, thread,
+                                                     level.name.ljust (5), category,
+                                                     filename, line, function,
+                                                     object_, message,)
+
 def main ():
 
     import sys
     import os.path
     sys.path.append (os.path.dirname (os.path.dirname (sys.argv[0])))
 
+    global Data
     from GstDebugViewer import Data
 
     count = 100000
@@ -31,8 +43,8 @@ def main ():
         ts = i * 10000
         shift += i % (count // 100)
         level = levels[(i + shift) % 3]
-        line = Data.LogLine ([ts, pid, thread, level, category, filename, file_line, function, object_, message])
-        print line.line_string ()
+        print line_string (ts, pid, thread, level, category, filename, file_line,
+                           function, object_, message)
 
 if __name__ == "__main__":
     main ()