[gegl] gcut: import frame boundary based timestamps correctly



commit a5aae6eabd272b09d3d07dd2929aa1d5781c631a
Author: Øyvind Kolås <pippin gimp org>
Date:   Wed Jul 26 22:04:13 2017 +0200

    gcut: import frame boundary based timestamps correctly

 gcut/gcut-ui.c |    7 +++++--
 gcut/gcut.c    |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gcut/gcut-ui.c b/gcut/gcut-ui.c
index 7001921..ce3441a 100644
--- a/gcut/gcut-ui.c
+++ b/gcut/gcut-ui.c
@@ -3403,8 +3403,11 @@ int gcut_ui_main (GeglEDL *edl)
 
   mrg_add_timeout (mrg, 10100, save_idle, edl);
 
-  cache_renderer_iteration (mrg, edl);
-  mrg_add_timeout (mrg, 90 /* seconds */  * 1000, cache_renderer_iteration, edl);
+  if (0)
+  {
+    cache_renderer_iteration (mrg, edl);
+    mrg_add_timeout (mrg, 90 /* seconds */  * 1000, cache_renderer_iteration, edl);
+  }
 
   gcut_get_duration (edl);
   //mrg_set_target_fps (mrg, -1);
diff --git a/gcut/gcut.c b/gcut/gcut.c
index eea0ac7..3244346 100644
--- a/gcut/gcut.c
+++ b/gcut/gcut.c
@@ -592,7 +592,7 @@ void gcut_parse_line (GeglEDL *edl, const char *line)
       if (p>line) p --;
       while (p>line && *p == ' ') p --;
 
-      while (p>line && (isdigit (*p) || (*p=='s'))){
+      while (p>line && (isdigit (*p) || (*p=='s') || (*p=='.') || (*p==':' ))){
         if (*p == 's') is_seconds = 1;
         p --;
       }
@@ -603,7 +603,7 @@ void gcut_parse_line (GeglEDL *edl, const char *line)
       if (p>line) p --;
       while (p>line && *p == ' ') p --;
       is_seconds = 0;
-      while (p>line && (isdigit (*p) || (*p=='s'))){
+      while (p>line && (isdigit (*p) || (*p=='s') || (*p=='.') || (*p==':'))){
         if (*p == 's') is_seconds = 1;
         p --;
       }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]