summaryrefslogtreecommitdiffstats
path: root/libhb/hb_json.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-05-26 17:10:09 +0000
committerjstebbins <[email protected]>2015-05-26 17:10:09 +0000
commit62dd0977862318d28fc9d19f2bb5ce96d61dd2c3 (patch)
tree985f907ece17cc7f5e47794ab7f0da6b637eda8b /libhb/hb_json.c
parent36aeaf4b29260cc97c9a2c6cbab11ee2555ca993 (diff)
scan: skip scan if title has already been scanned
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7226 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hb_json.c')
-rw-r--r--libhb/hb_json.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index 93673f371..69760cd83 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -391,8 +391,8 @@ hb_dict_t* hb_job_to_dict( const hb_job_t * job )
"s:o,"
// Destination {Mux, ChapterMarkers, ChapterList}
"s:{s:o, s:o, s:[]},"
- // Source {Title, Angle}
- "s:{s:o, s:o,},"
+ // Source {Path, Title, Angle}
+ "s:{s:o, s:o, s:o,},"
// PAR {Num, Den}
"s:{s:o, s:o},"
// Video {Codec, QSV {Decode, AsyncDepth}}
@@ -412,6 +412,7 @@ hb_dict_t* hb_job_to_dict( const hb_job_t * job )
"ChapterMarkers", hb_value_bool(job->chapter_markers),
"ChapterList",
"Source",
+ "Path", hb_value_string(job->title->path),
"Title", hb_value_int(job->title->index),
"Angle", hb_value_int(job->angle),
"PAR",
@@ -753,11 +754,12 @@ void hb_json_job_scan( hb_handle_t * h, const char * json_job )
// Wait for scan to complete
hb_state_t state;
- do
+ hb_get_state2(h, &state);
+ while (state.state == HB_STATE_SCANNING)
{
hb_snooze(50);
hb_get_state2(h, &state);
- } while (state.state == HB_STATE_SCANNING);
+ }
}
static int validate_audio_codec_mux(int codec, int mux, int track)