Changeset 214

Timestamp:

27/11/08 20:31:37 (6 weeks ago)

Author:

duncan

Message:

Updated language settings

Location:

trunk

Files:

• vbi2srt/Makefile (modified) (1 diff)
• vbi2srt/args.c (modified) (6 diffs)
• vbi2srt/args.h (modified) (1 diff)
• vbi2srt/main.c (modified) (32 diffs)
• vbi2srt/main.h (modified) (1 diff)
• vbi2srt/vbi.c (modified) (6 diffs)
• vbilib/Makefile (modified) (1 diff)
• vbilib/language.c (modified) (4 diffs)
• vbilib/teletext.c (modified) (15 diffs)
• vbilib/vbilib.h (modified) (2 diffs)
• vbishow/Makefile (modified) (1 diff)
• vbishow/vbi-show.c (modified) (5 diffs)

trunk/vbi2srt/Makefile

@@ -1 @@
-VERSION = -0.1.11
+VERSION = -0.2.02
 
 PREFIX = /usr/local

trunk/vbi2srt/args.c

@@ -93 +93 @@
     opt->libopt.input_name = "/dev/video0";
     opt->input = STDIN_FILENO;
-    opt->libopt.output_given = 0;
-    opt->libopt.output_name = "/dev/video16";
+    opt->output_given = 0;
+    opt->output_name = "/dev/video16";
     opt->output = STDOUT_FILENO;
     opt->time_offset_given = 0;
@@ -103 +103 @@
     opt->vbi_name = "/dev/vbi0";
     opt->vbi = 0;
-    opt->srt_given = 0;
-    opt->srt_name = "/dev/video0.srt";
-    opt->srt = 0;
+    opt->libopt.output_given = 0;
+    opt->libopt.output_name = "/dev/video0.libopt.output";
+    opt->libopt.output = 0;
     opt->srt_colour = 0;
     opt->libopt.pagenum_given = 0;
@@ -124 +124 @@
     fwprintf(stderr, L"input_given=%s\n", opt->libopt.input_given ? "yes" : "no");
     fwprintf(stderr, L"input_name=%s\n", opt->libopt.input_name);
-    fwprintf(stderr, L"output_given=%s\n", opt->libopt.output_given ? "yes" : "no");
-    fwprintf(stderr, L"output_name=%s\n", opt->libopt.output_name);
+    fwprintf(stderr, L"output_given=%s\n", opt->output_given ? "yes" : "no");
+    fwprintf(stderr, L"output_name=%s\n", opt->output_name);
     fwprintf(stderr, L"duration_given=%s\n", opt->duration_given ? "yes" : "no");
     fwprintf(stderr, L"duration=%d\n", opt->duration);
@@ -132 +132 @@
     fwprintf(stderr, L"vbi_given=%s\n", opt->vbi_given ? "yes" : "no");
     fwprintf(stderr, L"vbi_name=%s\n", opt->vbi_name);
-    fwprintf(stderr, L"srt_given=%s\n", opt->srt_given ? "yes" : "no");
-    fwprintf(stderr, L"srt_name=%s\n", opt->srt_name);
+    fwprintf(stderr, L"srt_given=%s\n", opt->libopt.output_given ? "yes" : "no");
+    fwprintf(stderr, L"srt_name=%s\n", opt->libopt.output_name);
     fwprintf(stderr, L"srt_colour=%s\n", opt->srt_colour ? "yes" : "no");
     fwprintf(stderr, L"vps_given=%s\n", opt->vps_given ? "yes" : "no");
@@ -418 +418 @@
 
         case 's':       /* set srt device.  */
-            if (opt->srt_given) {
+            if (opt->libopt.output_given) {
                 fwprintf(stderr, L"%s: `--srt' (`-%c') option given more than once\n",
                     opt->libopt.program, c);
                 return 1;
             }
-            opt->srt_given = 1;
-            opt->srt_name = strdup(optarg);
+            opt->libopt.output_given = 1;
+            opt->libopt.output_name = strdup(optarg);
             break;
 
@@ -442 +442 @@
 
         case 'o':       /* set video output device.  */
-            if (opt->libopt.output_given) {
+            if (opt->output_given) {
                 fwprintf(stderr, L"%s: `--output' (`-%c') option given more than once\n",
                     opt->libopt.program, c);
                 return 1;
             }
-            opt->libopt.output_given = 1;
-            opt->libopt.output_name = strdup(optarg);
+            opt->output_given = 1;
+            opt->output_name = strdup(optarg);
             break;
 

trunk/vbi2srt/args.h

@@ -42 +42 @@
     char *vbi_name;          /* vbi device. */
     int vbi;
-    int srt_given;           /* Whether srt device was given. */
-    char *srt_name;          /* srt filename. */
-    FILE *srt;
+    int output_given;        /* Whether output device was given. */
+    char *output_name;       /* output filename. */
+    FILE *output_fh;
+    //int srt_given;           /* Whether srt device was given. */
+    //char *srt_name;          /* srt filename. */
+    //FILE *srt;
     int srt_colour;          /* Whether to add colour codes to srt output. */
     int vps_given;           /* Whether VPS was given. */

trunk/vbi2srt/main.c

@@ -81 +81 @@
     if (signum == 15) {
         if (opt.libopt.printverbose) {
-            fwprintf(stderr, L"termination_handler called with %d, ignored.\n", signum);
+            vbiprintf(0, stderr, L"termination_handler called with %d, ignored.\n", signum);
         }
         return;
@@ -87 +87 @@
     */
     if (opt.libopt.printverbose) {
-        fwprintf(stderr, L"termination_handler called with %d\n", signum);
+        vbiprintf(0, stderr, L"termination_handler called with %d\n", signum);
     }
     terminate = 1;
@@ -97 +97 @@
     ssize_t bytes_read;
     ssize_t bytes_written;
-    fwprintf(stderr, L"verbose=%d\n", wd->opt->libopt.printverbose);
-    fwprintf(stderr, L"mpeg_worker thread started\n");
+    vbiprintf(0, stderr, L"verbose=%d\n", wd->opt->libopt.printverbose);
+    vbiprintf(0, stderr, L"mpeg_worker thread started\n");
     // wait for the streaming signal
     while (!wd->streaming) {
         if (terminate) {
-            fwprintf(stderr, L"mpeg_worker thread terminated not streaming\n");
+            vbiprintf(0, stderr, L"mpeg_worker thread terminated not streaming\n");
             goto finished;
         }
         usleep(MPEG_DELAY);
     }
-    fwprintf(stderr, L"mpeg_worker started recording\n");
+    vbiprintf(0, stderr, L"mpeg_worker started recording\n");
     for (;;) {
         if (terminate) {
@@ -114 +114 @@
                 enum v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 if (ioctl(wd->opt->input, VIDIOC_STREAMOFF, &buf_type) < 0) {
-                    fwprintf(stderr, L"VIDIOC_STREAMOFF failed: %s\n", strerror(errno));
+                    vbiprintf(0, stderr, L"VIDIOC_STREAMOFF failed: %s\n", strerror(errno));
                     break;
                 }
@@ -121 +121 @@
                 struct v4l2_encoder_cmd encoder_cmd = { V4L2_ENC_CMD_STOP, V4L2_ENC_CMD_STOP_AT_GOP_END };
                 if (ioctl(opt.input, VIDIOC_ENCODER_CMD, &encoder_cmd) != 0) {
-                    fwprintf(stderr, L"cannot set VIDIOC_ENCODER_CMD for \"%s\": %s\n",
+                    vbiprintf(0, stderr, L"cannot set VIDIOC_ENCODER_CMD for \"%s\": %s\n",
                         opt.libopt.input_name, strerror(errno));
                 }
 #endif
                 if (wd->opt->libopt.printverbose == 3) {
-                    fwprintf(stderr, L"\n");
-                }
-                fwprintf(stderr, L"mpeg_worker thread streaming off\n");
+                    vbiprintf(0, stderr, L"\n");
+                }
+                vbiprintf(0, stderr, L"mpeg_worker thread streaming off\n");
                 wd->streaming = 0;
             }
@@ -134 +134 @@
         bytes_read = read(wd->opt->input, wd->video_buffer, wd->video_buffer_size);
         if (wd->opt->libopt.printverbose >= 4) {
-            fwprintf(stderr, L"bytes_read=%d, video_buffer_size=%d\n", bytes_read, wd->video_buffer_size);
+            vbiprintf(0, stderr, L"bytes_read=%d, video_buffer_size=%d\n", bytes_read, wd->video_buffer_size);
         }
         if (bytes_read == 0) {
-            fwprintf(stderr, L"mpeg_worker thread terminated no more data\n");
+            vbiprintf(0, stderr, L"mpeg_worker thread terminated no more data\n");
             break;
         } else if (bytes_read < 0) {
-            fwprintf(stderr, L"mpeg_worker thread terminated data read error\n");
-            fwprintf(stderr, L"cannot read from \"%s\" %s\n", wd->opt->libopt.input_name, strerror(errno));
+            vbiprintf(0, stderr, L"mpeg_worker thread terminated data read error\n");
+            vbiprintf(0, stderr, L"cannot read from \"%s\" %s\n", wd->opt->libopt.input_name, strerror(errno));
             break;
         }
         bytes_written = write(wd->opt->output, wd->video_buffer, bytes_read);
-        if (wd->opt->libopt.printverbose >= 4) {
-            fwprintf(stderr, L"bytes_written=%d, bytes_read=%d\n", bytes_written, bytes_read);
-        }
-        if (wd->opt->libopt.printverbose == 3) {
-            fwprintf(stderr, L"%c", wd->streaming ? ',' : '.');
+        if (wd->opt->libopt.printverbose >= 5) {
+            vbiprintf(0, stderr, L"bytes_written=%d, bytes_read=%d\n", bytes_written, bytes_read);
+        }
+        if (wd->opt->libopt.printverbose == 4) {
+            vbiprintf(0, stderr, L"%c", wd->streaming ? ',' : '.');
         }
         fflush(stderr);
     }
-    fwprintf(stderr, L"mpeg_worker stopped recording\n");
+    vbiprintf(0, stderr, L"mpeg_worker stopped recording\n");
 finished:
     if (wd->opt->libopt.printverbose == 3) {
-        fwprintf(stderr, L"\n");
-    }
-    fwprintf(stderr, L"mpeg_worker thread finished\n");
+        vbiprintf(0, stderr, L"\n");
+    }
+    vbiprintf(0, stderr, L"mpeg_worker thread finished\n");
     fflush(stderr);
     return NULL;
@@ -166 +166 @@
 {
     if (opt.libopt.printverbose) {
-        fwprintf(stderr, L"vbi_worker thread started\n");
+        vbiprintf(0, stderr, L"vbi_worker thread started\n");
     }
     for (;;) {
@@ -175 +175 @@
     }
     if (opt.libopt.printverbose) {
-        fwprintf(stderr, L"vbi_worker thread finished\n");
+        vbiprintf(0, stderr, L"vbi_worker thread finished\n");
     }
 
@@ -242 +242 @@
                 break;
             }
-            fwprintf(stderr, L"%s\n", env[i]);
+            vbiprintf(0, stderr, L"%s\n", env[i]);
         }
     }
 
     if (opt.libopt.printverbose) {
-        fwprintf(stderr, L"Version is \"%s-%s\"\n", opt.libopt.program, opt.libopt.version);
-        fwprintf(stderr, L"locale is \"%s\", codeset is \"%s\"\n", opt.libopt.locale, nl_langinfo(CODESET));
-        fwprintf(stderr, L"\n");
+        vbiprintf(0, stderr, L"Version is \"%s-%s\"\n", opt.libopt.program, opt.libopt.version);
+        vbiprintf(0, stderr, L"locale is \"%s\", codeset is \"%s\"\n", opt.libopt.locale, nl_langinfo(CODESET));
+        vbiprintf(0, stderr, L"\n");
     }
 
     // Some signal handlers to terminate cleanly
     if (signal (SIGINT, termination_handler) == SIG_IGN) {
-        fwprintf(stderr, L"cannot set signal handler \"%s\": %s\n", "SIGINT", strerror(errno));
+        vbiprintf(0, stderr, L"cannot set signal handler \"%s\": %s\n", "SIGINT", strerror(errno));
         signal (SIGINT, SIG_IGN);
     }
     if (signal (SIGHUP, termination_handler) == SIG_IGN) {
-        fwprintf(stderr, L"cannot set signal handler \"%s\": %s\n", "SIGHUP", strerror(errno));
+        vbiprintf(0, stderr, L"cannot set signal handler \"%s\": %s\n", "SIGHUP", strerror(errno));
         signal (SIGHUP, SIG_IGN);
     }
     if (signal (SIGTERM, termination_handler) == SIG_IGN) {
-        fwprintf(stderr, L"cannot set signal handler \"%s\": %s\n", "SIGTERM", strerror(errno));
+        vbiprintf(0, stderr, L"cannot set signal handler \"%s\": %s\n", "SIGTERM", strerror(errno));
         signal (SIGTERM, SIG_IGN);
     }
@@ -268 +268 @@
     opt.input = open(opt.libopt.input_name, O_RDONLY|O_LARGEFILE);
     if (opt.input == -1) {
-        fwprintf(stderr, L"cannot open  \"%s\": %s\n", opt.libopt.input_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot open  \"%s\": %s\n", opt.libopt.input_name, strerror(errno));
         return 1;
     }
     if (fstat64(opt.input, &status) == -1) {
-        fwprintf(stderr, L"cannot stat  \"%s\": %s\n", opt.libopt.input_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot stat  \"%s\": %s\n", opt.libopt.input_name, strerror(errno));
         return 1;
     }
@@ -280 +280 @@
         int end_gop = 1;
         if (ioctl(opt.input, IVTV_IOC_S_GOP_END, &end_gop) != 0) {
-            fwprintf(stderr, L"cannot set IVTV_IOC_S_GOP_END for \"%s\": %s\n",
+            vbiprintf(0, stderr, L"cannot set IVTV_IOC_S_GOP_END for \"%s\": %s\n",
                 opt.libopt.input_name, strerror(errno));
         }
@@ -298 +298 @@
         v4l2_format.fmt.sliced.reserved[1] = 0;
         if (ioctl(opt.input, VIDIOC_S_FMT, &v4l2_format) < 0) {
-            //fwprintf(stderr, L"VIDIOC_S_FMT failed: \"%s\" %d\n", strerror(errno), errno);
-            fwprintf(stderr, L"ioctl(%d, VIDIOC_S_FMT, v4l2_format): %s\n", opt.input, strerror(errno));
+            //vbiprintf(0, stderr, L"VIDIOC_S_FMT failed: \"%s\" %d\n", strerror(errno), errno);
+            vbiprintf(0, stderr, L"ioctl(%d, VIDIOC_S_FMT, v4l2_format): %s\n", opt.input, strerror(errno));
         }
         memset(&v4l2_format, 0, sizeof(v4l2_format));
         v4l2_format.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
         if (ioctl(opt.input, VIDIOC_G_FMT, &v4l2_format) < 0) {
-            fwprintf(stderr, L"ioctl(%d, VIDIOC_G_FMT, v4l2_format): %s\n", opt.input, strerror(errno));
-        }
-        fwprintf(stderr, L"v4l2_format: 0x%0X\n", v4l2_format.fmt.sliced.service_set);
+            vbiprintf(0, stderr, L"ioctl(%d, VIDIOC_G_FMT, v4l2_format): %s\n", opt.input, strerror(errno));
+        }
+        vbiprintf(0, stderr, L"v4l2_format: 0x%0X\n", v4l2_format.fmt.sliced.service_set);
 
         struct v4l2_queryctrl qctrl;
         const char *name = "Stream VBI Format";
         int ctrl_id = find_control_id(opt.input, name, &qctrl);
-        fwprintf(stderr, L"0x%08X is the id for \"%s\"\n", ctrl_id, name);
+        vbiprintf(0, stderr, L"0x%08X is the id for \"%s\"\n", ctrl_id, name);
         
         struct v4l2_ext_controls ext_controls;
@@ -323 +323 @@
 
         if (ioctl(opt.input, VIDIOC_G_EXT_CTRLS, &ext_controls) < 0) {
-            fwprintf(stderr, L"ioctl(%d, VIDIOC_G_EXT_CTRLS, ext_controls): %s\n", opt.input, strerror(errno));
+            vbiprintf(0, stderr, L"ioctl(%d, VIDIOC_G_EXT_CTRLS, ext_controls): %s\n", opt.input, strerror(errno));
             return 2;
         }
@@ -329 +329 @@
         switch (qctrl.type) {
         case V4L2_CTRL_TYPE_INTEGER:
-            fwprintf(stderr, L"%s (int): min=%d max=%d step=%d default=%d value=%d", name, 
+            vbiprintf(0, stderr, L"%s (int): min=%d max=%d step=%d default=%d value=%d", name, 
                 qctrl.minimum, qctrl.maximum, qctrl.step, qctrl.default_value, ext_control[0].value);
             break;
         case V4L2_CTRL_TYPE_INTEGER64:
-            fwprintf(stderr, L"%s (int64): value=%lld", name, ext_control[0].value64);
+            vbiprintf(0, stderr, L"%s (int64): value=%lld", name, ext_control[0].value64);
             break;
         case V4L2_CTRL_TYPE_BOOLEAN:
-            fwprintf(stderr, L"%s (bool): default=%d value=%d", name, qctrl.default_value, ext_control[0].value);
+            vbiprintf(0, stderr, L"%s (bool): default=%d value=%d", name, qctrl.default_value, ext_control[0].value);
             break;
         case V4L2_CTRL_TYPE_MENU:
-            fwprintf(stderr, L"%s (menu): min=%d max=%d default=%d value=%d", name, 
+            vbiprintf(0, stderr, L"%s (menu): min=%d max=%d default=%d value=%d", name, 
                 qctrl.minimum, qctrl.maximum, qctrl.default_value, ext_control[0].value);
             break;
         case V4L2_CTRL_TYPE_BUTTON:
-            fwprintf(stderr, L"%s (button)\n", name);
+            vbiprintf(0, stderr, L"%s (button)\n", name);
             break;
         default:
             break;
         }
-            fwprintf(stderr, L"%s (int): min=%d max=%d step=%d default=%d value=%d", name, 
+            vbiprintf(0, stderr, L"%s (int): min=%d max=%d step=%d default=%d value=%d", name, 
                 qctrl.minimum, qctrl.maximum, qctrl.step, qctrl.default_value, ext_control[0].value);
         }
         if (opt.libopt.pagenum) {
-            fwprintf(stderr, L"pagenum=%d\n", opt.libopt.pagenum);
+            vbiprintf(0, stderr, L"pagenum=%d\n", opt.libopt.pagenum);
             ext_control[0].value = 1;
             if (ioctl(opt.input, VIDIOC_S_EXT_CTRLS, &ext_controls) < 0) {
-                fwprintf(stderr, L"ioctl(%d, VIDIOC_S_EXT_CTRLS, ext_controls): %s\n", opt.input, strerror(errno));
+                vbiprintf(0, stderr, L"ioctl(%d, VIDIOC_S_EXT_CTRLS, ext_controls): %s\n", opt.input, strerror(errno));
                 return 2;
             }
@@ -373 +373 @@
     }
 
-    opt.output = open(opt.libopt.output_name, O_WRONLY|O_CREAT|O_LARGEFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
+    opt.output = open(opt.output_name, O_WRONLY|O_CREAT|O_LARGEFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
     if (opt.output == -1) {
-        fwprintf(stderr, L"cannot open \"%s\": %s\n", opt.libopt.output_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot open \"%s\": %s\n", opt.output_name, strerror(errno));
         return 1;
     }
     if (fstat64(opt.output, &status) == -1) {
-        fwprintf(stderr, L"cannot stat \"%s\": %s\n", opt.libopt.output_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot stat \"%s\": %s\n", opt.output_name, strerror(errno));
         return 1;
     }
@@ -385 +385 @@
 
     if (opt.input_isdevice && opt.output_isdevice) {
-        fwprintf(stderr, L"WARNING: \"%s\" and \"%s\" are devices.\n", opt.libopt.input_name, opt.libopt.output_name);
+        vbiprintf(0, stderr, L"WARNING: \"%s\" and \"%s\" are devices.\n", opt.libopt.input_name, opt.libopt.output_name);
     }
 
     opt.vbi = open(opt.vbi_name, O_RDONLY|O_LARGEFILE|O_NONBLOCK);
     if (opt.vbi == -1) {
-        fwprintf(stderr, L"cannot open \"%s\": %s\n", opt.vbi_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot open \"%s\": %s\n", opt.vbi_name, strerror(errno));
         return 1;
     }
     if (fstat64(opt.vbi, &status) == -1) {
-        fwprintf(stderr, L"cannot stat \"%s\": %s\n", opt.vbi_name, strerror(errno));
+        vbiprintf(0, stderr, L"cannot stat \"%s\": %s\n", opt.vbi_name, strerror(errno));
         return 1;
     }
     opt.vbi_isdevice = S_ISCHR(status.st_mode);
     if (! opt.vbi_isdevice) {
-        fwprintf(stderr, L"\"%s\" is not a character device\n", opt.vbi_name);
-        return 1;
-    }
-
-
-    if (! opt.srt_given) {
+        vbiprintf(0, stderr, L"\"%s\" is not a character device\n", opt.vbi_name);
+        return 1;
+    }
+
+
+    if (! opt.libopt.output_given) {
         if (opt.input_isdevice) {
             int len = strlen(opt.libopt.output_name);
             char *p = rindex(basename(opt.libopt.output_name), '.');
-            opt.srt_name = malloc(len+5);
-            if (opt.srt_name == 0) {
+            opt.libopt.output_name = malloc(len+5);
+            if (opt.libopt.output_name == 0) {
                 return 1;
             }
@@ -415 +415 @@
                 len = p - opt.libopt.output_name;
             }
-            strcpy(&opt.srt_name[0], opt.libopt.output_name);
-            strcpy(&opt.srt_name[len], ".srt");
+            strcpy(&opt.libopt.output_name[0], opt.output_name);
+            strcpy(&opt.libopt.output_name[len], ".srt");
         } else {
             int len = strlen(opt.libopt.input_name);
             char *p = rindex(basename(opt.libopt.input_name), '.');
-            opt.srt_name = malloc(len+5);
-            if (opt.srt_name == 0) {
+            opt.libopt.output_name = malloc(len+5);
+            if (opt.libopt.output_name == 0) {
                 return 1;
             }
@@ -427 +427 @@
                 len = p - opt.libopt.input_name;
             }
-            strcpy(&opt.srt_name[0], opt.libopt.input_name);
-            strcpy(&opt.srt_name[len], ".srt");
+            strcpy(&opt.libopt.output_name[0], opt.libopt.input_name);
+            strcpy(&opt.libopt.output_name[len], ".srt");
         }
     }
 
     if (opt.libopt.pagenum) {
-        opt.srt = fopen(opt.srt_name, "w");
-        if (opt.srt_name == NULL) {
-            fwprintf(stderr, L"cannot open srt \"%s\": %s\n", opt.srt_name, strerror(errno));
+        opt.libopt.output = fopen(opt.libopt.output_name, "w");
+        if (opt.libopt.output_name == NULL) {
+            vbiprintf(0, stderr, L"cannot open srt \"%s\": %s\n", opt.libopt.output_name, strerror(errno));
             return 1;
         }
-        if (fstat64(fileno(opt.srt), &status) == -1) {
-            fwprintf(stderr, L"cannot stat \"%s\": %s\n", opt.srt_name, strerror(errno));
+        if (fstat64(fileno(opt.libopt.output), &status) == -1) {
+            vbiprintf(0, stderr, L"cannot stat \"%s\": %s\n", opt.libopt.output_name, strerror(errno));
             return 1;
         }
         opt.srt_isdevice = S_ISCHR(status.st_mode);
         if (opt.srt_isdevice) {
-            fwprintf(stderr, L"\"%s\" is a character device\n", opt.srt_name);
+            vbiprintf(0, stderr, L"\"%s\" is a character device\n", opt.libopt.output_name);
             return 1;
         }
@@ -455 +455 @@
     if (! opt.libopt.utf8) {
         if (opt.libopt.pagenum) {
-            fwprintf(stderr, L"WARNING: Subtitles will contain unicode characters but locale is \"%s\"\n", 
+            vbiprintf(0, stderr, L"WARNING: Subtitles will contain unicode characters but locale is \"%s\"\n", 
                 opt.libopt.locale);
         }
@@ -470 +470 @@
     vbidata.fmt.fmt.sliced.reserved[1] = 0;
     if (ioctl(opt.vbi, VIDIOC_S_FMT, &vbidata.fmt) < 0) {
-        fwprintf(stderr, L"VIDIOC_S_FMT failed: \"%s\" %d\n", strerror(errno), errno);
+        vbiprintf(0, stderr, L"VIDIOC_S_FMT failed: \"%s\" %d\n", strerror(errno), errno);
         close(opt.vbi);
         return 1;
@@ -476 +476 @@
 
     if (opt.libopt.printverbose >= 4) {
-        fwprintf(stderr, L"service_set=%08x, io_size=%d\n", 
+        vbiprintf(0, stderr, L"service_set=%08x, io_size=%d\n", 
             vbidata.fmt.fmt.sliced.service_set, vbidata.fmt.fmt.sliced.io_size);
-        fwprintf(stderr, L"\n");
+        vbiprintf(0, stderr, L"\n");
     }
 
@@ -484 +484 @@
 
     if (clock_gettime (CLOCK_REALTIME, &now) != 0) {
-        fwprintf(stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
+        vbiprintf(0, stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
     }
     vps_pat_watchdog(&now);
@@ -494 +494 @@
     if (pthread_create (&mpeg_worker_thread, NULL, mpeg_worker, (void *)&mpegdata) != 0) {
         perror("mpeg_worker_thread");
-        fwprintf(stderr, L"Failed to create mpeg worker thread \"%s\"\n", strerror(errno));
+        vbiprintf(0, stderr, L"Failed to create mpeg worker thread \"%s\"\n", strerror(errno));
         return 1;
     }
@@ -500 +500 @@
     if (pthread_create (&vbi_worker_thread, NULL, vbi_worker, (void *)&vbidata) != 0) {
         perror("vbi_worker_thread");
-        fwprintf(stderr, L"Failed to create vbi worker thread \"%s\"\n", strerror(errno));
+        vbiprintf(0, stderr, L"Failed to create vbi worker thread \"%s\"\n", strerror(errno));
         return 1;
     }
@@ -508 +508 @@
         subtitles_init(&opt, &now);
     }
+
+    if (clock_gettime (CLOCK_REALTIME, &now) != 0) {
+        vbiprintf(0, stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
+    }
+    prev_t.now = now;
+    prev_t.fno = frames;
 
     for (;;) {
@@ -517 +523 @@
             pthread_join (vbi_worker_thread, NULL);
             pthread_join (mpeg_worker_thread, NULL);
-            fwprintf(stderr, L"terminated\n");
+            vbiprintf(0, stderr, L"terminated\n");
             break;
         }
 
         if (clock_gettime (CLOCK_REALTIME, &now) != 0) {
-            fwprintf(stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
-        }
-
-        if (clock_gettime (CLOCK_REALTIME, &now) != 0) {
-            fwprintf(stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
+            vbiprintf(0, stderr, L"clock_gettime failed: \"%s\" %d\n", strerror(errno), errno);
         }
         this_t.now = now;
@@ -534 +536 @@
         if (opt.libopt.printverbose >= 4) {
             if (vbi_bytes_read >= 0) {
-                fwprintf(stderr, L"vbi_bytes_read=%d\n", vbi_bytes_read);
+                vbiprintf(0, stderr, L"vbi_bytes_read=%d\n", vbi_bytes_read);
             }
         }
@@ -559 +561 @@
                 if (opt.libopt.printverbose) {
                     vps_time(&now);
-                    fwprintf(stderr, L"vps state %s->%s\n", vps_state_name(laststate), vps_state_name(state));
+                    vbiprintf(0, stderr, L"vps state %s->%s\n", vps_state_name(laststate), vps_state_name(state));