sensible-cinema 0.34.0 → 0.35.3

data/zamples/edit_decision_lists/dvds/edls_being_edited/ratatouille.txt

@@ -6,15 +6,15 @@
 
   "1:26:19.09" , "1:26:22.39", "profanity", "bloo..", "and no one else seems to have it in this [bloo..] town,",
 
-  "0:03:11.12" , "0:03:12.82", "profanity", "deity", "Close to [deity]liness.",
-  "0:22:42.52" , "0:22:44.42", "profanity", "deity", "Five minutes, chef. - Oh, [deity].",
+  "0:03:11.12" , "0:03:12.82", "profanity", "deity", "Close to [vain use]liness.",
+  "0:22:42.52" , "0:22:44.42", "profanity", "deity", "Five minutes, chef. - Oh, [vain use].",
   "0:35:11.63" , "0:35:17.13", "profanity", "he..", "Welcome to [he..]  Now, recreate the soup.",
-  "0:57:38.29" , "0:57:42.19", "profanity", "deity", "Nothing's been poisoned, thank [deity], but it hasn't been easy.",
+  "0:57:38.29" , "0:57:42.19", "profanity", "deity", "Nothing's been poisoned, thank [vain use], but it hasn't been easy.",
 ],
 
 "blank_outs" => [
-  # an example line, uncomment the leading "#" to make it active
-  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+
+  "0:10", "0:15", 
 ],
 
 "source" => "dvd",

data/zamples/edit_decision_lists/dvds/edls_being_edited/rio.txt

@@ -0,0 +1,24 @@
+# edl_version_version 1.1, sensible cinema v0.34.0
+# comments can go be created by placing text after a # on any line, for example this one.
+"name" => "Rio",
+
+"mutes" => [
+   "1:16:51.18", "1:16:51.90",  # in portuges  
+ 
+],
+
+"blank_outs" => [
+    "1:13:12.90", "1:13:21.89", #riske  
+],
+
+"source" => "dvd",
+"volume_name" => "RIO",
+"timestamps_relative_to" => ["dvd_start_offset","29.97"],
+"disk_unique_id" => "3b70cf79|a9b792f7",
+"dvd_title_track" => "1", # our guess for it
+"dvd_title_track_length" => "5751.333", 
+# "not edited out stuff" => "some...",
+# "closing thoughts" => "only ...",
+# "subtitles_to_display_relative_path" => "some_file.srt" # if you want to display some custom subtitles alongside your movie
+"dvd_title_track_start_offset" => "0.2",
+"dvd_nav_packet_offset" => [0.766667, 0.862967],

data/zamples/edit_decision_lists/dvds/sintel_open_source_blender_ntsc_dvd.txt

@@ -6,7 +6,6 @@
 "blank_outs" => [
   "00:00:56.0" , "00:00:57.0", "violence", "knife stabbing",
   "00:01:05.0" , "00:01:14.5", "violence", "stab through",
-  "90.0", "100.0", "violence", "test cut",
 ],
 
 "dvd_nav_packet_offset" => [0.5, 0.734067],

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.34.0
+  version: 0.35.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-04-21 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: os
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.25.2
+            version: 0.25.4
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -241,9 +241,11 @@ files:
   - experimental_online_player_ocr_readme.txt
   - go
   - go.bat
+  - go.sh
   - go_ocr_tracker.bat
   - goc
   - goc.bat
+  - goc.sh
   - gpl-2.0.txt
   - gplv3.txt
   - history_and_related_works_list.txt
@@ -258,7 +260,6 @@ files:
   - lib/blanker.rb
   - lib/check_installed_mac.rb
   - lib/convert_thirty_fps.rb
-  - lib/count_down_timer_jruby_swing.rb
   - lib/edl_parser.rb
   - lib/eight_three.rb
   - lib/extract/dumpstream.bat
@@ -292,6 +293,7 @@ files:
   - roadmap_possibilities
   - spec/arse.srt
   - spec/auto_window_finder.spec.rb
+  - spec/bad_beginning.srt
   - spec/blanker.spec.rb
   - spec/common.rb
   - spec/convert_image.rb
@@ -313,6 +315,7 @@ files:
   - spec/test_yaml.yml
   - spec/tsmuxer.output
   - spec/vlc_programmer.spec.rb
+  - spec/youtube_edl.spec.rb
   - spec/zoom_player_max_edl.spec.rb
   - template_bats/README_DISTRO.TXT
   - template_bats/RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat
@@ -395,21 +398,14 @@ files:
   - vendor/movie-content-editor-read-only/subtitle.py
   - vendor/movie-content-editor-read-only/vlc.py
   - vendor/movie-content-editor-read-only/vlcwidget.py
-  - vendor/mplayer_patches/apply.bat
-  - vendor/mplayer_patches/configure_from_betterlogic
-  - vendor/mplayer_patches/libdvdnav/2905259c3b45529b3d8dedba572b6e4f67a2d8f4.diff
-  - vendor/mplayer_patches/libdvdnav/83f1c9256f500285e46f1e44bcc74ffce90159db.diff
-  - vendor/mplayer_patches/libdvdnav/eb91fb74680d30322461a1b9e425918ad4e2b2df.diff
-  - vendor/mplayer_patches/libdvdnav/jump_to_time.diff
-  - vendor/mplayer_patches/libdvdnav/non_strict.diff
-  - vendor/mplayer_patches/mplayer_edl.diff
+  - vendor/mplayer_patches/how_to_doze.bat
   - vendor/mplayer_patches/port_dir/PortIndex.quick
   - vendor/mplayer_patches/port_dir/how_to
   - vendor/mplayer_patches/port_dir/multimedia/mplayer-edl/Portfile
   - vendor/mplayer_patches/port_dir/multimedia/mplayer-edl/files/configure.x11.patch
   - vendor/mplayer_patches/port_dir/multimedia/mplayer-edl/files/llvm-gcc-workaround.patch
   - vendor/mplayer_patches/port_dir/multimedia/rdp-projects/Portfile
-  - vendor/mplayer_patches/updated_lib_too
+  - vendor/mplayer_patches/port_dir_is_for_mac
   - vendor/profs.png
   - vendor/readme.txt.setpriority
   - vendor/subfont.ttf
@@ -436,9 +432,15 @@ files:
   - zamples/edit_decision_lists/dvds/condor_man_widescreen.txt
   - zamples/edit_decision_lists/dvds/cool runnings.txt
   - zamples/edit_decision_lists/dvds/court_jester.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/father_goose.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/harry_potter_and_the_goblet_of_fire.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/making_marriage_work.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/national_treasure.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/percy_jackson_lightening_thief.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/percy_jackson_lightening_thief_mute_scary.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/puss_in_boots.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/ratatouille.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/rio.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/test_delete_list_for_experimenting_with.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/the_explorers.txt
   - zamples/edit_decision_lists/dvds/finding_neverland.txt
@@ -517,9 +519,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: an EDL scene-skipper/bleeper that works with DVD's and online players like hulu
+summary: an EDL scene-skipper/bleeper that works with DVD's and files and online players like netflix instant
 test_files: []
 

data/lib/count_down_timer_jruby_swing.rb

@@ -1,55 +0,0 @@
-require 'rubygems'
-require 'sane' # require_relative
-require_relative 'jruby-swing-helpers/swing_helpers'
-
-include SwingHelpers
-  
-class MainWindow < JFrame
-
-  def show_blocking_message_dialog(message, title = message.split("\n")[0], style= JOptionPane::INFORMATION_MESSAGE)
-    # I think I'm already on top...
-    setVisible(true);
-    toFront()
-    JOptionPane.showMessageDialog(nil, message, title, style)
-    true
-  end
-
-  def initialize
-      super "countdown"
-      set_size 150,100
-      setDefaultCloseOperation JFrame::EXIT_ON_CLOSE # happiness
-      @jlabel = JLabel.new 'Welcome to Sensible Cinema!'
-      happy = Font.new("Tahoma", Font::PLAIN, 11)
-      @jlabel.setFont(happy)
-      @jlabel.set_bounds(44,44,160,14)
-      panel = JPanel.new
-      @panel = panel
-      @buttons = []
-      panel.set_layout nil
-      add panel # why can't I just slap these down?
-      panel.add @jlabel
-      @start_time = Time.now
-      @jlabel.set_text 'welcome...'
-      
-      starting_seconds_requested = (ARGV[0] || '25').to_f*60
-      @switch_image_timer = javax.swing.Timer.new(1000, nil) # nil means it has no default person to call when the action has occurred...
-      @switch_image_timer.add_action_listener do |e|
-        seconds_left = starting_seconds_requested - (Time.now - @start_time)
-        if seconds_left < 0
-          setVisible(true)
-          toFront()
-          show_blocking_message_dialog "timer done!"
-          @start_time = Time.now
-        else
-          # avoid weird re-draw issues
-          @jlabel.set_text "%02d:%02d" % [seconds_left/60, seconds_left % 60]
-        end
-      end
-      @switch_image_timer.start
-      self.always_on_top=true
-  end
-  
-  end
-
-  MainWindow.new.show
-

data/vendor/mplayer_patches/apply.bat

@@ -1,12 +0,0 @@
-rem assumes you in mplayer/ dir
-rem known to work with r 34396, ffmpeg  eb4fc6acfede7ced5737c5bf023f
-patch -p0 <  %~dp0/mplayer_edl.diff
-cd libdvdnav
-echo 'just retype last part of name'
-patch -p0 <  %~dp0/libdvdnav/2905259c3b45529b3d8dedba572b6e4f67a2d8f4.diff
-patch -p0 <  %~dp0/libdvdnav/83f1c9256f500285e46f1e44bcc74ffce90159db.diff
-patch -p0 <  %~dp0/libdvdnav/eb91fb74680d30322461a1b9e425918ad4e2b2df.diff
-@rem below actually work
-patch -p0 <  %~dp0/libdvdnav/non_strict.diff
-patch -p1 <  %~dp0/libdvdnav/jump_to_time.diff
-cd ..

data/vendor/mplayer_patches/libdvdnav/2905259c3b45529b3d8dedba572b6e4f67a2d8f4.diff

@@ -1,19 +0,0 @@
-diff --git a/src/dvdnav_internal.h b/src/dvdnav_internal.h
-index e78470d..089ab14 100644
---- a/src/dvdnav_internal.h
-+++ b/src/dvdnav_internal.h
-@@ -76,6 +76,14 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
- #define DVD_VIDEO_LB_LEN 2048
- #endif
- 
-+typedef enum {
-+  DSI_ILVU_PRE   = 1 << 15, /* set during the last 3 VOBU preceeding an interleaved block. */
-+  DSI_ILVU_BLOCK = 1 << 14, /* set for all VOBU in an interleaved block */
-+  DSI_ILVU_FIRST = 1 << 13, /* set for the first VOBU for a given angle or scene within a ILVU, or the first VOBU in the preparation (PREU) sequence */
-+  DSI_ILVU_LAST  = 1 << 12, /* set for the last VOBU for a given angle or scene within a ILVU, or the last VOBU in the preparation (PREU) sequence */
-+  DSI_ILVU_MASK  = 0xf000
-+} DSI_ILVU;
-+
- typedef struct read_cache_s read_cache_t;
- 
- /*

data/vendor/mplayer_patches/libdvdnav/83f1c9256f500285e46f1e44bcc74ffce90159db.diff

@@ -1,16 +0,0 @@
-diff --git a/src/dvdnav.c b/src/dvdnav.c
-index e82df12..40d44c7 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
-@@ -336,8 +336,9 @@ static int32_t dvdnav_get_vobu(dvdnav_t *this, dsi_t *nav_dsi, pci_t *nav_pci, d
-     dvdnav_angle_change(this, 1);
-   }
- #endif
--
--  if(num_angle != 0) {
-+  /* only use ILVU information if we are at the last vobunit in ILVU */
-+  /* otherwise we will miss nav packets from vobunits inbetween */
-+  if(num_angle != 0 && (nav_dsi->sml_pbi.category & DSI_ILVU_MASK) == (DSI_ILVU_BLOCK | DSI_ILVU_LAST)) {
- 
-     if((next = nav_pci->nsml_agli.nsml_agl_dsta[angle-1]) != 0) {
-       if((next & 0x3fffffff) != 0) {

data/vendor/mplayer_patches/libdvdnav/eb91fb74680d30322461a1b9e425918ad4e2b2df.diff

@@ -1,21 +0,0 @@
-diff --git a/src/dvdnav.c b/src/dvdnav.c
-index 4d0b4f1..c849b18 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
-@@ -733,7 +733,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
-        * otherwise it might show stills or menus too shortly */
-       if ((this->position_current.still || this->pci.hli.hl_gi.hli_ss) && !this->sync_wait_skip) {
-         this->sync_wait = 1;
--      } else {
-+      }
- 	if( this->position_current.still == 0 || this->skip_still ) {
- 	  /* no active cell still -> get us to the next cell */
- 	  vm_get_next_cell(this->vm);
-@@ -741,7 +741,6 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
- 	  this->skip_still = 0;
- 	  this->sync_wait_skip = 0;
- 	}
--      }
-       /* handle related state changes in next iteration */
-       (*event) = DVDNAV_NOP;
-       (*len) = 0;

data/vendor/mplayer_patches/libdvdnav/jump_to_time.diff

@@ -1,654 +0,0 @@
-Index: src/searching.c
-===================================================================
---- src/searching.c	(revision 1243)
-+++ src/searching.c	(working copy)
-@@ -36,6 +36,7 @@
- #include "vm/decoder.h"
- #include "vm/vm.h"
- #include "dvdnav_internal.h"
-+#include <dvdread/ifo_read.h>
- 
- /*
- #define LOG_DEBUG
-@@ -654,3 +655,575 @@
-     free(tmp);
-   return retval;
- }
-+
-+/* Get an admap and admap_len */
-+static vobu_admap_t* dvdnav_admap_get(dvdnav_t *this, dvd_state_t *state,
-+            int32_t *admap_len) {
-+  vobu_admap_t *admap = NULL;
-+  switch(state->domain) {
-+  case FP_DOMAIN:
-+  case VMGM_DOMAIN:
-+    admap = this->vm->vmgi->menu_vobu_admap;
-+    break;
-+  case VTSM_DOMAIN:
-+    admap = this->vm->vtsi->menu_vobu_admap;
-+    break;
-+  case VTS_DOMAIN:
-+    admap = this->vm->vtsi->vts_vobu_admap;
-+    break;
-+  default: {
-+    fprintf(MSG_OUT, "Unknown domain");
-+    return NULL;
-+  }
-+  }
-+  if (admap == NULL) return NULL;
-+
-+  *admap_len = (admap->last_byte + 1 - VOBU_ADMAP_SIZE) / VOBU_ADMAP_SIZE;
-+  if (*admap_len <= 0) {
-+    fprintf(MSG_OUT, "admap_len <= 0");
-+    return NULL;
-+  }
-+  return admap;
-+}
-+
-+/* Get a tmap, tmap_len and tmap_interval */
-+static vts_tmap_t* dvdnav_tmap_get(dvdnav_t *this, dvd_state_t *state,
-+            int32_t *tmap_len, int32_t *tmap_interval) {
-+  int32_t vts_idx = 0;
-+  domain_t domain;
-+  ifo_handle_t *ifo = NULL;
-+  vts_tmapt_t *tmapt = NULL;
-+  uint16_t tmap_count = 0;
-+  int32_t pgcN = 0;
-+  vts_tmap_t *tmap = NULL;
-+  int32_t result = 0;
-+
-+  vts_idx = state->vtsN;
-+  domain = state->domain;
-+  switch(domain) {
-+  case FP_DOMAIN:
-+  case VTSM_DOMAIN:
-+  case VMGM_DOMAIN: {
-+    ifo = this->vm->vmgi;
-+    break;
-+  }
-+  case VTS_DOMAIN: {
-+    ifo = this->vm->vtsi;
-+    break;
-+  }
-+  default: {
-+    fprintf(MSG_OUT, "unknown domain for tmap");
-+    return NULL;
-+  }
-+  }
-+  if (ifo == NULL) return NULL;
-+  tmapt = ifo->vts_tmapt;
-+  /* HACK: ifo->vts_tmapt is NULL b/c ifo_read.c never loads it
-+   * load ifo->vts_tmapt directly*/
-+  if (tmapt == NULL) {
-+    result = ifoRead_VTS_TMAPT(ifo);
-+    if (!result) {
-+      return NULL;
-+    }
-+    tmapt = ifo->vts_tmapt;
-+    if (tmapt == NULL) return NULL;
-+  }
-+
-+  tmap_count = tmapt->nr_of_tmaps;
-+  pgcN = state->pgcN - 1; /* -1 b/c pgcN is base1 */
-+  if (pgcN < 0) {
-+    fprintf(MSG_OUT, "pgcN < 0");
-+    return NULL;
-+  }
-+
-+  /* get tmap */
-+  switch(domain) {
-+  case FP_DOMAIN:
-+  case VMGM_DOMAIN:
-+  case VTSM_DOMAIN: {
-+    if (tmap_count == 0) {
-+      fprintf(MSG_OUT, "tmap_count == 0");
-+      return NULL;
-+    }
-+    tmap = &tmapt->tmap[0]; /* ASSUME: vmgi only has one time map */
-+    break;
-+  }
-+  case VTS_DOMAIN: {
-+    if (pgcN >= tmap_count) {
-+      fprintf(MSG_OUT, "pgcN >= tmap_count; pgcN=%i tmap_count=%i",
-+          pgcN, tmap_count);
-+      return NULL;
-+    }
-+    tmap = &tmapt->tmap[pgcN];
-+    break;
-+  }
-+  }
-+  if (tmap == NULL) return NULL;
-+
-+  /* tmap->tmu is in seconds; convert to millisecs */
-+  *tmap_interval = tmap->tmu * 1000;
-+  if (*tmap_interval == 0) {
-+    fprintf(MSG_OUT, "tmap_interval == 0");
-+    return NULL;
-+  }
-+  *tmap_len = tmap->nr_of_entries;
-+  if (*tmap_len == 0) {
-+    fprintf(MSG_OUT, "tmap_len == 0");
-+    return NULL;
-+  }
-+  return tmap;
-+}
-+
-+/* Get a sector from a tmap */
-+static int32_t dvdnav_tmap_get_entry(vts_tmap_t *tmap, uint16_t tmap_len,
-+            int32_t idx, uint32_t *sector) {
-+  /* tmaps start at idx 0 which represents a sector at time 1 * tmap_interval
-+   * this creates a "fake" tmap index at idx -1 for sector 0 */
-+  if (idx == TMAP_IDX_EDGE_BGN) {
-+    *sector = 0;
-+    return 1;
-+  }
-+  if (idx < TMAP_IDX_EDGE_BGN || idx >= tmap_len) {
-+    fprintf(MSG_OUT, "idx out of bounds idx=%i %i", idx, tmap_len);
-+    return 0;
-+  }
-+  /* 0x7fffffff unsets discontinuity bit if present */
-+  *sector = tmap->map_ent[idx] & 0x7fffffff;
-+  return 1;
-+}
-+
-+/* Do a binary search for earlier admap index near find_sector */
-+static int32_t dvdnav_admap_search(vobu_admap_t *admap, uint32_t admap_len,
-+            uint32_t find_sector, uint32_t *vobu) {
-+  int32_t adj = 1;
-+  int32_t prv_pos = 0;
-+  int32_t prv_len = admap_len;
-+  int32_t cur_len = 0;
-+  int32_t cur_idx = 0;
-+  uint32_t cur_sector = 0;
-+  while (1) {
-+    cur_len = prv_len / 2;
-+    /* need to add 1 when prv_len == 3 (cur_len shoud go to 2, not 1) */
-+    if (prv_len % 2 == 1) ++cur_len;
-+    cur_idx = prv_pos + (cur_len * adj);
-+    if       (cur_idx < 0)           cur_idx = 0;
-+    else if  (cur_idx >= admap_len)  cur_idx = admap_len - 1;
-+
-+    cur_sector = admap->vobu_start_sectors[cur_idx];
-+    if      (find_sector <  cur_sector) adj = -1;
-+    else if (find_sector >  cur_sector) adj =  1;
-+    else if (find_sector == cur_sector) {
-+      *vobu = cur_idx;
-+      return 1;
-+    }
-+    if (cur_len == 1) {/* no smaller intervals left */
-+      if (adj == -1) {/* last comparison was greater; take lesser */
-+          cur_idx -= 1;
-+          cur_sector = admap->vobu_start_sectors[cur_idx];
-+      }
-+      *vobu = cur_idx;
-+      return 1;
-+    }
-+    prv_len = cur_len;
-+    prv_pos = cur_idx;
-+  }
-+}
-+
-+/* Do a binary search for the earlier tmap entry near find_sector */
-+static int32_t dvdnav_tmap_search(vts_tmap_t *tmap, uint32_t tmap_len,
-+            uint32_t find_sector, int32_t *tmap_idx, uint32_t *sector) {
-+  int32_t adj = 1;
-+  int32_t prv_pos = 0;
-+  int32_t prv_len = tmap_len;
-+  int32_t result = 0;
-+  int32_t cur_len = 0;
-+  int32_t cur_idx = 0;
-+  uint32_t cur_sector = 0;
-+  while (1) {
-+    cur_len = prv_len / 2;
-+    /* need to add 1 when prv_len == 3 (cur_len shoud go to 2, not 1) */
-+    if (prv_len % 2 == 1) ++cur_len;
-+    cur_idx = prv_pos + (cur_len * adj);
-+    if      (cur_idx < 0)         cur_idx = 0;
-+    else if (cur_idx >= tmap_len) cur_idx = tmap_len - 1;
-+    cur_sector = 0;
-+    result = dvdnav_tmap_get_entry(tmap, tmap_len, cur_idx, &cur_sector);
-+    if (!result) return 0;
-+    if      (find_sector <  cur_sector) adj = -1;
-+    else if (find_sector >  cur_sector) adj =  1;
-+    else if (find_sector == cur_sector) {
-+      *tmap_idx = cur_idx;
-+      *sector = cur_sector;
-+      return 1;
-+    }
-+    if (cur_len == 1) {/* no smaller intervals left */
-+      if (adj == -1) {/* last comparison was greater; take lesser */
-+        if (cur_idx == 0) { /* fake tmap index for sector 0 */
-+          cur_idx = TMAP_IDX_EDGE_BGN;
-+          cur_sector = 0;
-+        }
-+        else {
-+          cur_idx -= 1;
-+          result = dvdnav_tmap_get_entry(tmap, tmap_len, cur_idx, &cur_sector);
-+          if (!result) return 0;
-+        }
-+      }
-+      *tmap_idx = cur_idx;
-+      *sector = cur_sector;
-+      return 1;
-+    }
-+    prv_len = cur_len;
-+    prv_pos = cur_idx;
-+  }
-+}
-+
-+/* Find the cell for a given sector */
-+static int32_t dvdnav_cell_find(dvdnav_t *this, dvd_state_t *state,
-+            uint64_t find_val, dvdnav_cell_data_t *cell_data) {
-+  uint32_t cells_len = 0;
-+  uint32_t cells_bgn = 0;
-+  uint32_t cells_end = 0;
-+  uint32_t cell_idx = 0;
-+  pgc_t *pgc = NULL;
-+  int pgN = 0;
-+  cell_playback_t *cell = NULL;
-+  int found = 0;
-+
-+  pgc = state->pgc;
-+  if (pgc == NULL) return 0;
-+  cells_len = pgc->nr_of_cells;
-+  if (cells_len == 0) {
-+    fprintf(MSG_OUT, "cells_len == 0");
-+    return 0;
-+  }
-+
-+  /* get cells_bgn, cells_end */
-+  if (this->pgc_based) {
-+    cells_bgn = 1;
-+    cells_end = cells_len;
-+  }
-+  else {
-+    pgN = state->pgN;
-+    cells_bgn = pgc->program_map[pgN - 1]; /* -1 b/c pgN is 1 based? */
-+    if (pgN < pgc->nr_of_programs) {
-+      cells_end = pgc->program_map[pgN] - 1;
-+    }
-+    else {
-+      cells_end = cells_len;
-+    }
-+  }
-+
-+  /* search cells */
-+  for (cell_idx = cells_bgn; cell_idx <= cells_end; cell_idx++) {
-+    cell = &(pgc->cell_playback[cell_idx - 1]); /* -1 b/c cell is base1 */
-+    /* if angle block, only consider first angleBlock
-+     * (others are "redundant" for purpose of search) */
-+    if ( cell->block_type == BLOCK_TYPE_ANGLE_BLOCK
-+      && cell->block_mode != BLOCK_MODE_FIRST_CELL) {
-+      continue;
-+    }
-+    cell_data->bgn->sector = cell->first_sector;
-+    cell_data->end->sector = cell->last_sector;
-+
-+    /* 90 pts to ms */
-+    cell_data->end->time += (dvdnav_convert_time(&cell->playback_time) / 90);
-+    if (  find_val >= cell_data->bgn->time
-+       && find_val <= cell_data->end->time) {
-+      found = 1;
-+      break;
-+    }
-+    cell_data->bgn->time = cell_data->end->time;
-+  }
-+
-+  /* found cell: set var */
-+  if (found) {
-+    cell_data->idx = cell_idx;
-+  }
-+  else
-+    fprintf(MSG_OUT, "cell not found; find=%"PRId64"", find_val);
-+  return found;
-+}
-+
-+/* Given two sectors and a fraction, calc the corresponding vobu */
-+static int32_t dvdnav_admap_interpolate_vobu(dvdnav_jump_args_t *args,
-+            dvdnav_pos_data_t *bgn, dvdnav_pos_data_t *end, uint32_t fraction,
-+            uint32_t *jump_sector) {
-+  int32_t result = 0;
-+  uint32_t vobu_len = 0;
-+  uint32_t vobu_adj = 0;
-+  uint32_t vobu_idx = 0;
-+
-+  /* get bgn->vobu_idx */
-+  result = dvdnav_admap_search(args->admap, args->admap_len,
-+      bgn->sector, &bgn->vobu_idx);
-+  if (!result) {
-+    fprintf(MSG_OUT, "admap_interpolate: could not find sector_bgn");
-+    return 0;
-+  }
-+
-+  /* get end->vobu_idx */
-+  result = dvdnav_admap_search(args->admap, args->admap_len,
-+      end->sector, &end->vobu_idx);
-+  if (!result) {
-+    fprintf(MSG_OUT, "admap_interpolate: could not find sector_end");
-+    return 0;
-+  }
-+
-+  vobu_len = end->vobu_idx - bgn->vobu_idx;
-+  /* +500 to round up else 74% of a 4 sec interval = 2 sec */
-+  vobu_adj = ((fraction * vobu_len) + 500) / 1000;
-+  /* HACK: need to add +1, or else will land too soon (not sure why) */
-+  vobu_adj++;
-+  vobu_idx = bgn->vobu_idx + vobu_adj;
-+  if (vobu_idx >= args->admap_len) {
-+    fprintf(MSG_OUT, "admap_interpolate: vobu_idx >= admap_len");
-+    return 0;
-+  }
-+  *jump_sector = args->admap->vobu_start_sectors[vobu_idx];
-+  return 1;
-+}
-+
-+/* Given two tmap entries and a time, calc the time for the lo tmap entry */
-+static int32_t dvdnav_tmap_calc_time_for_tmap_entry(dvdnav_jump_args_t *args,
-+            dvdnav_pos_data_t *lo, dvdnav_pos_data_t *hi,
-+            dvdnav_pos_data_t *pos, uint64_t *out_time) {
-+  int32_t result = 0;
-+  uint32_t vobu_pct = 0;
-+  uint64_t time_adj = 0;
-+
-+  if (lo->sector == hi->sector) {
-+    fprintf(MSG_OUT, "lo->sector == hi->sector: %i", lo->sector);
-+    return 0;
-+  }
-+
-+  /* get vobus corresponding to lo, hi, pos */
-+  result = dvdnav_admap_search(args->admap, args->admap_len,
-+      lo->sector, &lo->vobu_idx);
-+  if (!result) {
-+    fprintf(MSG_OUT, "lo->vobu: lo->sector=%i", lo->sector);
-+    return 0;
-+  }
-+  result = dvdnav_admap_search(args->admap, args->admap_len,
-+      hi->sector, &hi->vobu_idx);
-+  if (!result) {
-+    fprintf(MSG_OUT, "hi->vobu: hi->sector=%i", hi->sector);
-+    return 0;
-+  }
-+  result = dvdnav_admap_search(args->admap, args->admap_len,
-+      pos->sector, &pos->vobu_idx);
-+  if (!result) {
-+    fprintf(MSG_OUT, "pos->vobu: pos->sector=%i", pos->sector);
-+    return 0;
-+  }
-+
-+  /* calc position of cell relative to lo */
-+  vobu_pct = ((pos->vobu_idx - lo->vobu_idx) * 1000)
-+            / ( hi->vobu_idx - lo->vobu_idx);
-+  if (vobu_pct < 0 || vobu_pct > 1000) {
-+    fprintf(MSG_OUT, "vobu_pct must be between 0 and 1000");
-+    return 0;
-+  }
-+
-+  /* calc time of lo */
-+  time_adj = (uint64_t)((args->tmap_interval * vobu_pct) / 1000);
-+  *out_time = pos->time - time_adj;
-+  return 1;
-+}
-+
-+/* Find the tmap entries on either side of a given sector */
-+static int32_t dvdnav_tmap_get_entries_for_sector(dvdnav_t *this,
-+            dvd_state_t *state, dvdnav_jump_args_t *args,
-+            dvdnav_cell_data_t *cell_data, uint32_t find_sector,
-+            dvdnav_pos_data_t *lo, dvdnav_pos_data_t *hi) {
-+  int32_t result = 0;
-+
-+  result = dvdnav_tmap_search(args->tmap, args->tmap_len, find_sector,
-+      &lo->tmap_idx, &lo->sector);
-+  if (!result) {
-+    fprintf(MSG_OUT, "could not find lo idx: %i", find_sector);
-+    return 0;
-+  }
-+
-+  /* HACK: Most DVDs have a tmap that starts at sector 0
-+   * However, some have initial dummy cells that are not seekable
-+   * (restricted = y).
-+   * These cells will throw off the tmap calcs when in the first playable cell.
-+   * For now, assume that lo->sector is equal to the cell->bgn->sector
-+   * Note that for most DVDs this will be 0
-+   * (Since they will have no dummy cells and cell 1 will start at sector 0)
-+   */
-+  if (lo->tmap_idx == TMAP_IDX_EDGE_BGN) {
-+    lo->sector = cell_data->bgn->sector;
-+  }
-+
-+  if (lo->tmap_idx == args->tmap_len - 1) {
-+    /* lo is last tmap entry; "fake" entry for one beyond
-+     * and mark it with cell_end_sector */
-+    hi->tmap_idx = TMAP_IDX_EDGE_END;
-+    hi->sector = cell_data->end->sector;
-+  }
-+  else {
-+    hi->tmap_idx = lo->tmap_idx + 1;
-+    result = dvdnav_tmap_get_entry(args->tmap, args->tmap_len,
-+        hi->tmap_idx, &hi->sector);
-+    if (!result) {
-+      fprintf(MSG_OUT, "could not find hi idx: %i", find_sector);
-+      return 0;
-+    }
-+  }
-+  return 1;
-+}
-+
-+/* Find the nearest vobu by using the tmap */
-+static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
-+            dvdnav_jump_args_t *args, dvdnav_cell_data_t *cell_data,
-+            dvdnav_pos_data_t *jump) {
-+  uint64_t seek_offset = 0;
-+  uint32_t seek_idx = 0;
-+  int32_t result = 0;
-+  dvdnav_pos_data_t *cell_bgn_lo = NULL;
-+  dvdnav_pos_data_t *cell_bgn_hi = NULL;
-+  dvdnav_pos_data_t *jump_lo = NULL;
-+  dvdnav_pos_data_t *jump_hi = NULL;
-+
-+  /* get tmap, tmap_len, tmap_interval */
-+  args->tmap = dvdnav_tmap_get(this, state,
-+      &args->tmap_len, &args->tmap_interval);
-+  if (args->tmap == NULL) return 0;
-+
-+  /* get tmap entries on either side of cell_bgn */
-+  cell_bgn_lo = &(dvdnav_pos_data_t){0};
-+  cell_bgn_hi = &(dvdnav_pos_data_t){0};
-+  result = dvdnav_tmap_get_entries_for_sector(this, state, args, cell_data,
-+      cell_data->bgn->sector, cell_bgn_lo, cell_bgn_hi);
-+  if (!result) return 0;
-+
-+  /* calc time of cell_bgn_lo */
-+  result = dvdnav_tmap_calc_time_for_tmap_entry(args, cell_bgn_lo, cell_bgn_hi,
-+      cell_data->bgn, &cell_bgn_lo->time);
-+  if (!result) return 0;
-+
-+  /* calc time of jump_time relative to cell_bgn_lo */
-+  seek_offset = jump->time - cell_bgn_lo->time;
-+  seek_idx = (uint32_t)(seek_offset / args->tmap_interval);
-+  uint32_t seek_remainder = seek_offset - (seek_idx * args->tmap_interval);
-+  uint32_t seek_pct = (seek_remainder * 1000) / args->tmap_interval;
-+
-+  /* get tmap entries on either side of jump_time */
-+  jump_lo = &(dvdnav_pos_data_t){0};
-+  jump_hi = &(dvdnav_pos_data_t){0};
-+
-+  /* if seek_idx == 0, then tmap_indexes are the same, do not re-get
-+   * also, note cell_bgn_lo will already have sector if TMAP_IDX_EDGE_BGN */
-+  if (seek_idx == 0) {
-+    jump_lo = cell_bgn_lo;
-+    jump_hi = cell_bgn_hi;
-+  }
-+  else {
-+    jump_lo->tmap_idx = (uint32_t)(cell_bgn_lo->tmap_idx + seek_idx);
-+    result = dvdnav_tmap_get_entry(args->tmap, args->tmap_len,
-+        jump_lo->tmap_idx, &jump_lo->sector);
-+    if (!result) return 0;
-+
-+    /* +1 handled by dvdnav_tmap_get_entry */
-+    jump_hi->tmap_idx = jump_lo->tmap_idx + 1;
-+    result = dvdnav_tmap_get_entry(args->tmap, args->tmap_len,
-+        jump_hi->tmap_idx, &jump_hi->sector);
-+    if (!result) return 0;
-+  }
-+
-+  /* interpolate sector */
-+  result = dvdnav_admap_interpolate_vobu(args, jump_lo, jump_hi,
-+      seek_pct, &jump->sector);
-+
-+  return result;
-+}
-+
-+/* Find the nearest vobu by using the cell boundaries */
-+static int32_t dvdnav_find_vobu_by_cell_boundaries(dvdnav_t *this,
-+            dvdnav_jump_args_t *args, dvdnav_cell_data_t *cell_data,
-+            dvdnav_pos_data_t *jump) {
-+  uint64_t jump_offset = 0;
-+  uint64_t cell_len = 0;
-+  uint32_t jump_pct = 0;
-+  int32_t result = 0;
-+
-+  /* get jump_offset */
-+  jump_offset = jump->time - cell_data->bgn->time;
-+  if (jump_offset < 0) {
-+    fprintf(MSG_OUT, "jump_offset < 0");
-+    return 0;
-+  }
-+  cell_len = cell_data->end->time - cell_data->bgn->time;
-+  if (cell_len < 0) {
-+    fprintf(MSG_OUT, "cell_len < 0");
-+    return 0;
-+  }
-+  jump_pct = (jump_offset * 1000) / cell_len;
-+
-+  /* get sector */
-+  /* NOTE: end cell sector in VTS_PGC is last sector of cell
-+   * this last sector is not the start of a VOBU
-+   * +1 to get sector that is the start of a VOBU
-+   * start of a VOBU is needed in order to index into admap */
-+  cell_data->end->sector += 1;
-+  result = dvdnav_admap_interpolate_vobu(args,
-+      cell_data->bgn, cell_data->end, jump_pct, &jump->sector);
-+  if (!result) {
-+    fprintf(MSG_OUT, "find_by_admap.interpolate");
-+    return 0;
-+  }
-+  return 1;
-+}
-+
-+dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
-+            uint64_t time_in_pts_ticks) {
-+  int32_t result = 1;
-+  dvd_state_t *state = NULL;
-+  uint32_t sector_off = 0;
-+  dvdnav_pos_data_t *jump = NULL;
-+  dvdnav_cell_data_t *cell_data = NULL;
-+  dvdnav_jump_args_t *args = NULL;
-+
-+  jump = &(dvdnav_pos_data_t){0};
-+  /* convert time to milliseconds */
-+  jump->time = time_in_pts_ticks / 90;
-+
-+  /* get variables that will be used across both functions */
-+  state = &(this->vm->state);
-+  if (state == NULL) goto exit;
-+
-+  /* get cell info */
-+  cell_data = &(dvdnav_cell_data_t){0};
-+  cell_data->bgn = &(dvdnav_pos_data_t){0};
-+  cell_data->end = &(dvdnav_pos_data_t){0};
-+  result = dvdnav_cell_find(this, state, jump->time, cell_data);
-+  if (!result) goto exit;
-+
-+  /* get admap */
-+  args = &(dvdnav_jump_args_t){0};
-+  args->admap = dvdnav_admap_get(this, state, &args->admap_len);
-+  if (args->admap == NULL) goto exit;
-+
-+  /* find sector */
-+  result = dvdnav_find_vobu_by_tmap(this, state, args, cell_data, jump);
-+  if (!result) {// bad tmap; interpolate over cell
-+    result = dvdnav_find_vobu_by_cell_boundaries(this, args, cell_data, jump);
-+    if (!result) {
-+      goto exit;
-+    }
-+  }
-+
-+  /* jump to sector */
-+  sector_off = jump->sector - cell_data->bgn->sector;
-+  this->cur_cell_time = 0;
-+  if (vm_jump_cell_block(this->vm, cell_data->idx, sector_off)) {
-+    pthread_mutex_lock(&this->vm_lock);
-+    this->vm->hop_channel += HOP_SEEK;
-+    pthread_mutex_unlock(&this->vm_lock);
-+    result = 1;
-+  }
-+
-+exit:
-+  return result;
-+}
-Index: src/dvdnav_internal.h
-===================================================================
---- src/dvdnav_internal.h	(revision 1243)
-+++ src/dvdnav_internal.h	(working copy)
-@@ -125,6 +125,42 @@
- } ATTRIBUTE_PACKED spu_status_t;
- #endif
- 
-+/*
-+ * Describes a given time, and the closest sector, vobu and tmap index
-+ */
-+typedef struct {
-+  uint64_t            time;
-+  uint32_t            sector;
-+  uint32_t            vobu_idx;
-+  int32_t             tmap_idx;
-+} dvdnav_pos_data_t;
-+
-+/*
-+ * Encapsulates cell data
-+ */
-+typedef struct {
-+  int32_t             idx;
-+  dvdnav_pos_data_t   *bgn;
-+  dvdnav_pos_data_t   *end;
-+} dvdnav_cell_data_t;
-+
-+/*
-+ * Encapsulates common variables used by internal functions of jump_to_time
-+ */
-+typedef struct {
-+  vobu_admap_t        *admap;
-+  int32_t             admap_len;
-+  vts_tmap_t          *tmap;
-+  int32_t             tmap_len;
-+  int32_t             tmap_interval;
-+} dvdnav_jump_args_t;
-+
-+/*
-+ * Utility constants for jump_to_time
-+ */
-+#define TMAP_IDX_EDGE_BGN  -1
-+#define TMAP_IDX_EDGE_END  -2
-+
- typedef struct dvdnav_vobu_s {
-   int32_t vobu_start;  /* Logical Absolute. MAX needed is 0x300000 */
-   int32_t vobu_length;
-Index: src/dvdnav/dvdnav.h
-===================================================================
---- src/dvdnav/dvdnav.h	(revision 1243)
-+++ src/dvdnav/dvdnav.h	(working copy)
-@@ -388,6 +388,14 @@
- 				   uint64_t time);
- 
- /*
-+ * Find the nearest vobu and jump to it
-+ *
-+ * Alternative to dvdnav_time_search
-+ */
-+dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
-+            uint64_t time_in_pts_ticks);
-+
-+/*
-  * Stop playing current position and play the "GoUp"-program chain.
-  * (which generally leads to the title menu or a higher-level menu).
-  */