X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=11b80357e26c9ff777c6fabdc818c2b150b83c3f;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=3db173f0aec54149baa81943234a2873f4f660ed;hpb=a7f8bd6842d316d2a19cf63355b1d343a244b42d;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index 3db173f0..11b80357 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -1,8 +1,20 @@ #include "hb.h" #include "hbffmpeg.h" +#include +#include +#include + +#if defined( SYS_MINGW ) +#include +#if defined( PTW32_STATIC_LIB ) +#include +#endif +#endif struct hb_handle_s { + int id; + /* The "Check for update" thread */ int build; char version[32]; @@ -49,8 +61,11 @@ struct hb_handle_s hb_lock_t *hb_avcodec_lock; hb_work_object_t * hb_objects = NULL; +int hb_instance_counter = 0; +int hb_process_initialized = 0; static void thread_func( void * ); +hb_title_t * hb_get_title_by_index( hb_handle_t *, int ); void hb_avcodec_init() { @@ -76,6 +91,99 @@ int hb_avcodec_close(AVCodecContext *avctx) return ret; } +int hb_ff_layout_xlat(int64_t ff_channel_layout, int channels) +{ + int hb_layout; + + switch (ff_channel_layout) + { + case CH_LAYOUT_MONO: + hb_layout = HB_INPUT_CH_LAYOUT_MONO; + break; + case CH_LAYOUT_STEREO: + hb_layout = HB_INPUT_CH_LAYOUT_STEREO; + break; + case CH_LAYOUT_SURROUND: + hb_layout = HB_INPUT_CH_LAYOUT_3F; + break; + case CH_LAYOUT_4POINT0: + hb_layout = HB_INPUT_CH_LAYOUT_3F1R; + break; + case CH_LAYOUT_2_2: + hb_layout = HB_INPUT_CH_LAYOUT_2F2R; + break; + case CH_LAYOUT_QUAD: + hb_layout = HB_INPUT_CH_LAYOUT_2F2R; + break; + case CH_LAYOUT_5POINT0: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R; + break; + case CH_LAYOUT_5POINT1: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; + case CH_LAYOUT_5POINT0_BACK: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R; + break; + case CH_LAYOUT_5POINT1_BACK: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; + case CH_LAYOUT_7POINT0: + hb_layout = HB_INPUT_CH_LAYOUT_3F4R; + break; + case CH_LAYOUT_7POINT1: + hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; + case CH_LAYOUT_STEREO_DOWNMIX: + hb_layout = HB_INPUT_CH_LAYOUT_STEREO; + break; + default: + hb_layout = HB_INPUT_CH_LAYOUT_STEREO; + break; + } + // Now make sure the chosen layout agrees with the number of channels + // ffmpeg tells us there are. It seems ffmpeg is sometimes confused + // about this. So we will make a best guess based on the number + // of channels. + int chans = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( hb_layout ); + if ( chans == channels ) + { + return hb_layout; + } + hb_log( "Channels reported by ffmpeg (%d) != computed layout channels (%d).", channels, chans ); + switch (channels) + { + case 1: + hb_layout = HB_INPUT_CH_LAYOUT_MONO; + break; + case 2: + hb_layout = HB_INPUT_CH_LAYOUT_STEREO; + break; + case 3: + hb_layout = HB_INPUT_CH_LAYOUT_3F; + break; + case 4: + hb_layout = HB_INPUT_CH_LAYOUT_3F1R; + break; + case 5: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R; + break; + case 6: + hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; + case 7: + hb_layout = HB_INPUT_CH_LAYOUT_3F4R; + break; + case 8: + hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; + default: + hb_log("Unsupported number of audio channels (%d).\n", channels); + hb_layout = 0; + break; + } + return hb_layout; +} + /** * Registers work objects, by adding the work object to a liked list. * @param w Handle to hb_work_object_t to register. @@ -87,6 +195,45 @@ void hb_register( hb_work_object_t * w ) } /** + * Ensures that the process has been initialized. + */ +static void process_init() +{ + if (!hb_process_initialized) + { +#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB ) + pthread_win32_process_attach_np(); +#endif + +#if defined( _WIN32 ) || defined( __MINGW32__ ) + setvbuf( stdout, NULL, _IONBF, 0 ); + setvbuf( stderr, NULL, _IONBF, 0 ); +#endif + hb_process_initialized = 1; + } + +} + +void (*hb_log_callback)(const char* message); +static void redirect_thread_func(void *); + +#if defined( SYS_MINGW ) +#define pipe(phandles) _pipe (phandles, 4096, _O_BINARY) +#endif + +/** + * Registers the given function as a logger. All logs will be passed to it. + * @param log_cb The function to register as a logger. + */ +void hb_register_logger( void (*log_cb)(const char* message) ) +{ + process_init(); + + hb_log_callback = log_cb; + hb_thread_init("ioredirect", redirect_thread_func, NULL, HB_NORMAL_PRIORITY); +} + +/** * libhb initialization routine. * @param verbose HB_DEBUG_NONE or HB_DEBUG_ALL. * @param update_check signals libhb to check for updated version from HandBrake website. @@ -94,6 +241,8 @@ void hb_register( hb_work_object_t * w ) */ hb_handle_t * hb_init( int verbose, int update_check ) { + process_init(); + hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 ); uint64_t date; @@ -101,7 +250,9 @@ hb_handle_t * hb_init( int verbose, int update_check ) global_verbosity_level = verbose; if( verbose ) putenv( "HB_DEBUG=1" ); - + + h->id = hb_instance_counter++; + /* Check for an update on the website if asked to */ h->build = -1; @@ -165,6 +316,9 @@ hb_handle_t * hb_init( int verbose, int update_check ) hb_register( &hb_encvobsub ); hb_register( &hb_deccc608 ); hb_register( &hb_decsrtsub ); + hb_register( &hb_decutf8sub ); + hb_register( &hb_dectx3gsub ); + hb_register( &hb_decssasub ); hb_register( &hb_render ); hb_register( &hb_encavcodec ); hb_register( &hb_encx264 ); @@ -183,7 +337,7 @@ hb_handle_t * hb_init( int verbose, int update_check ) #ifdef __APPLE__ hb_register( &hb_encca_aac ); #endif - + return h; } @@ -205,6 +359,8 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) putenv( "HB_DEBUG=1" ); } + h->id = hb_instance_counter++; + /* Check for an update on the website if asked to */ h->build = -1; @@ -264,6 +420,9 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) hb_register( &hb_encvobsub ); hb_register( &hb_deccc608 ); hb_register( &hb_decsrtsub ); + hb_register( &hb_decutf8sub ); + hb_register( &hb_dectx3gsub ); + hb_register( &hb_decssasub ); hb_register( &hb_render ); hb_register( &hb_encavcodec ); hb_register( &hb_encx264 ); @@ -345,7 +504,7 @@ void hb_remove_previews( hb_handle_t * h ) struct dirent * entry; memset( dirname, 0, 1024 ); - hb_get_tempory_directory( h, dirname ); + hb_get_temporary_directory( dirname ); dir = opendir( dirname ); if (dir == NULL) return; @@ -359,7 +518,7 @@ void hb_remove_previews( hb_handle_t * h ) for( i = 0; i < count; i++ ) { title = hb_list_item( h->list_title, i ); - len = snprintf( filename, 1024, "%" PRIxPTR, (intptr_t) title ); + len = snprintf( filename, 1024, "%d_%d", h->id, title->index ); if (strncmp(entry->d_name, filename, len) == 0) { snprintf( filename, 1024, "%s/%s", dirname, entry->d_name ); @@ -380,7 +539,7 @@ void hb_remove_previews( hb_handle_t * h ) * @param store_previews Whether or not to write previews to disk. */ void hb_scan( hb_handle_t * h, const char * path, int title_index, - int preview_count, int store_previews ) + int preview_count, int store_previews, uint64_t min_duration ) { hb_title_t * title; @@ -397,7 +556,7 @@ void hb_scan( hb_handle_t * h, const char * path, int title_index, hb_log( "hb_scan: path=%s, title_index=%d", path, title_index ); h->scan_thread = hb_scan_init( h, &h->scan_die, path, title_index, h->list_title, preview_count, - store_previews ); + store_previews, min_duration ); } /** @@ -413,9 +572,27 @@ hb_list_t * hb_get_titles( hb_handle_t * h ) /** * Create preview image of desired title a index of picture. * @param h Handle to hb_handle_t. + * @param title_index Index of the title to get the preview for (1-based). + * @param picture Index in title. + * @param buffer Handle to buffer were image will be drawn. + */ +void hb_get_preview_by_index( hb_handle_t * h, int title_index, int picture, uint8_t * buffer ) +{ + hb_title_t * title; + + title = hb_get_title_by_index( h, title_index ); + if ( title != NULL ) + { + hb_get_preview( h, title, picture, buffer ); + } +} + +/** + * Create preview image of desired title a index of picture. + * @param h Handle to hb_handle_t. * @param title Handle to hb_title_t of desired title. * @param picture Index in title. - * @param buffer Handle to buufer were inage will be drawn. + * @param buffer Handle to buffer were image will be drawn. */ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, uint8_t * buffer ) @@ -450,8 +627,8 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, memset( filename, 0, 1024 ); - hb_get_tempory_filename( h, filename, "%" PRIxPTR "%d", - (intptr_t) title, picture ); + hb_get_tempory_filename( h, filename, "%d_%d_%d", + h->id, title->index, picture ); file = fopen( filename, "rb" ); if( !file ) @@ -617,13 +794,13 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i if( average_cc > threshold ) { #if 0 - hb_log("Average %i combed (Threshold %i) %i/%i/%i | PTS: %lld (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); + hb_log("Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); #endif return 1; } #if 0 - hb_log("SKIPPED Average %i combed (Threshold %i) %i/%i/%i | PTS: %lld (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); + hb_log("SKIPPED Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" ); #endif /* Reaching this point means no combing detected. */ @@ -634,11 +811,31 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i /** * Calculates job width and height for anamorphic content, * + * @param h Instance handle + * @param title_index Index of the title/job to inspect (1-based). + * @param output_width Pointer to returned storage width + * @param output_height Pointer to returned storage height + * @param output_par_width Pointer to returned pixel width + * @param output_par_height Pointer to returned pixel height + */ +void hb_set_anamorphic_size_by_index( hb_handle_t * h, int title_index, + int *output_width, int *output_height, + int *output_par_width, int *output_par_height ) +{ + hb_title_t * title; + title = hb_get_title_by_index( h, title_index ); + + hb_set_anamorphic_size( title->job, output_width, output_height, output_par_width, output_par_height ); +} + +/** + * Calculates job width and height for anamorphic content, + * * @param job Handle to hb_job_t * @param output_width Pointer to returned storage width * @param output_height Pointer to returned storage height * @param output_par_width Pointer to returned pixel width - @ param output_par_height Pointer to returned pixel height + * @param output_par_height Pointer to returned pixel height */ void hb_set_anamorphic_size( hb_job_t * job, int *output_width, int *output_height, @@ -649,7 +846,7 @@ void hb_set_anamorphic_size( hb_job_t * job, int cropped_width = title->width - job->crop[2] - job->crop[3] ; int cropped_height = title->height - job->crop[0] - job->crop[1] ; double storage_aspect = (double)cropped_width / (double)cropped_height; - int mod = job->anamorphic.modulus ? job->anamorphic.modulus : 16; + int mod = job->modulus ? job->modulus : 16; double aspect = title->aspect; int pixel_aspect_width = job->anamorphic.par_width; @@ -710,6 +907,11 @@ void hb_set_anamorphic_size( hb_job_t * job, - 3: Power user anamorphic, specify everything */ int width, height; + int maxWidth, maxHeight; + + maxWidth = MULTIPLE_MOD_DOWN( job->maxWidth, mod ); + maxHeight = MULTIPLE_MOD_DOWN( job->maxHeight, mod ); + switch( job->anamorphic.mode ) { case 1: @@ -736,27 +938,24 @@ void hb_set_anamorphic_size( hb_job_t * job, If not, set job height to job width divided by storage aspect. */ - if ( job->maxWidth && (job->maxWidth < job->width) ) - width = job->maxWidth; - /* Time to get picture width that divide cleanly.*/ width = MULTIPLE_MOD( width, mod); - /* Verify these new dimensions don't violate max height and width settings */ - if ( job->maxWidth && (job->maxWidth < job->width) ) - width = job->maxWidth; + if ( maxWidth && (maxWidth < job->width) ) + width = maxWidth; + /* Verify these new dimensions don't violate max height and width settings */ height = ((double)width / storage_aspect) + 0.5; - - if ( job->maxHeight && (job->maxHeight < height) ) - height = job->maxHeight; /* Time to get picture height that divide cleanly.*/ height = MULTIPLE_MOD( height, mod); - - /* Verify these new dimensions don't violate max height and width settings */ - if ( job->maxHeight && (job->maxHeight < height) ) - height = job->maxHeight; + + if ( maxHeight && (maxHeight < height) ) + { + height = maxHeight; + width = ((double)height * storage_aspect) + 0.5; + width = MULTIPLE_MOD( width, mod); + } /* The film AR is the source's display width / cropped source height. The output display width is the output height * film AR. @@ -774,28 +973,42 @@ void hb_set_anamorphic_size( hb_job_t * job, - Set everything based on specified values */ /* Use specified storage dimensions */ + storage_aspect = (double)job->width / (double)job->height; width = job->width; height = job->height; - /* Bind to max dimensions */ - if( job->maxWidth && width > job->maxWidth ) - width = job->maxWidth; - if( job->maxHeight && height > job->maxHeight ) - height = job->maxHeight; - /* Time to get picture dimensions that divide cleanly.*/ width = MULTIPLE_MOD( width, mod); height = MULTIPLE_MOD( height, mod); - /* Verify we're still within max dimensions */ - if( job->maxWidth && width > job->maxWidth ) - width = job->maxWidth - (mod/2); - if( job->maxHeight && height > job->maxHeight ) - height = job->maxHeight - (mod/2); - - /* Re-ensure we have picture dimensions that divide cleanly. */ - width = MULTIPLE_MOD( width, mod ); - height = MULTIPLE_MOD( height, mod ); + /* Bind to max dimensions */ + if( maxWidth && width > maxWidth ) + { + width = maxWidth; + // If we are keeping the display aspect, then we are going + // to be modifying the PAR anyway. So it's preferred + // to let the width/height stray some from the original + // requested storage aspect. + // + // But otherwise, PAR and DAR will change the least + // if we stay as close as possible to the requested + // storage aspect. + if ( !job->anamorphic.keep_display_aspect ) + { + height = ((double)width / storage_aspect) + 0.5; + height = MULTIPLE_MOD( height, mod); + } + } + if( maxHeight && height > maxHeight ) + { + height = maxHeight; + // Ditto, see comment above + if ( !job->anamorphic.keep_display_aspect ) + { + width = ((double)height * storage_aspect) + 0.5; + width = MULTIPLE_MOD( width, mod); + } + } /* That finishes the storage dimensions. On to display. */ if( job->anamorphic.dar_width && job->anamorphic.dar_height ) @@ -954,6 +1167,53 @@ hb_job_t * hb_current_job( hb_handle_t * h ) } /** + * Applies information from the given job to the official job instance. + * @param h Handle to hb_handle_t. + * @param title_index Index of the title to apply the chapter name to (1-based). + * @param chapter The chapter to apply the name to (1-based). + * @param job Job information to apply. + */ +void hb_set_chapter_name( hb_handle_t * h, int title_index, int chapter_index, const char * chapter_name ) +{ + hb_title_t * title; + title = hb_get_title_by_index( h, title_index ); + + hb_chapter_t * chapter = hb_list_item( title->list_chapter, chapter_index - 1 ); + + strncpy(chapter->title, chapter_name, 1023); + chapter->title[1023] = '\0'; +} + +/** + * Applies information from the given job to the official job instance. + * Currently only applies information needed for anamorphic size calculation and previews. + * @param h Handle to hb_handle_t. + * @param title_index Index of the title to apply the job information to (1-based). + * @param job Job information to apply. + */ +void hb_set_job( hb_handle_t * h, int title_index, hb_job_t * job ) +{ + int i; + + hb_title_t * title; + title = hb_get_title_by_index( h, title_index ); + + hb_job_t * job_target = title->job; + + job_target->deinterlace = job->deinterlace; + job_target->width = job->width; + job_target->height = job->height; + job_target->maxWidth = job->maxWidth; + job_target->maxHeight = job->maxHeight; + for (i = 0; i < 4; i++) + { + job_target->crop[i] = job->crop[i]; + } + + job_target->anamorphic = job->anamorphic; +} + +/** * Adds a job to the job list. * @param h Handle to hb_handle_t. * @param job Handle to hb_job_t. @@ -1260,6 +1520,52 @@ void hb_scan_stop( hb_handle_t * h ) } /** + * Gets a filter object with the given type and settings. + * @param filter_id The type of filter to get. + * @param settings The filter settings to use. + * @returns The requested filter object. + */ +hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings) +{ + if (filter_id == HB_FILTER_ROTATE) + { + hb_filter_rotate.settings = (char*)settings; + return &hb_filter_rotate; + } + + if (filter_id == HB_FILTER_DETELECINE) + { + hb_filter_detelecine.settings = (char*)settings; + return &hb_filter_detelecine; + } + + if (filter_id == HB_FILTER_DECOMB) + { + hb_filter_decomb.settings = (char*)settings; + return &hb_filter_decomb; + } + + if (filter_id == HB_FILTER_DEINTERLACE) + { + hb_filter_deinterlace.settings = (char*)settings; + return &hb_filter_deinterlace; + } + + if (filter_id == HB_FILTER_DEBLOCK) + { + hb_filter_deblock.settings = (char*)settings; + return &hb_filter_deblock; + } + + if (filter_id == HB_FILTER_DENOISE) + { + hb_filter_denoise.settings = (char*)settings; + return &hb_filter_denoise; + } + return NULL; +} + +/** * Returns the state of the conversion process. * @param h Handle to hb_handle_t. * @param s Handle to hb_state_t which to copy the state data. @@ -1303,6 +1609,7 @@ void hb_close( hb_handle_t ** _h ) hb_title_t * title; h->die = 1; + hb_thread_close( &h->main_thread ); while( ( title = hb_list_item( h->list_title, 0 ) ) ) @@ -1320,9 +1627,41 @@ void hb_close( hb_handle_t ** _h ) hb_list_close( &h->jobs ); hb_lock_close( &h->state_lock ); hb_lock_close( &h->pause_lock ); + free( h ); *_h = NULL; +} + +/** + * Cleans up libhb at a process level. Call before the app closes. Removes preview directory. + */ +void hb_global_close() +{ + char dirname[1024]; + DIR * dir; + struct dirent * entry; + + /* Find and remove temp folder */ + memset( dirname, 0, 1024 ); + hb_get_temporary_directory( dirname ); + dir = opendir( dirname ); + if (dir) + { + while( ( entry = readdir( dir ) ) ) + { + char filename[1024]; + if( entry->d_name[0] == '.' ) + { + continue; + } + memset( filename, 0, 1024 ); + snprintf( filename, 1023, "%s/%s", dirname, entry->d_name ); + unlink( filename ); + } + closedir( dir ); + rmdir( dirname ); + } } /** @@ -1335,14 +1674,12 @@ static void thread_func( void * _h ) { hb_handle_t * h = (hb_handle_t *) _h; char dirname[1024]; - DIR * dir; - struct dirent * entry; h->pid = getpid(); /* Create folder for temporary files */ memset( dirname, 0, 1024 ); - hb_get_tempory_directory( h, dirname ); + hb_get_temporary_directory( dirname ); hb_mkdir( dirname ); @@ -1409,29 +1746,40 @@ static void thread_func( void * _h ) hb_snooze( 50 ); } + if( h->scan_thread ) + { + hb_scan_stop( h ); + hb_thread_close( &h->scan_thread ); + } if( h->work_thread ) { hb_stop( h ); hb_thread_close( &h->work_thread ); } + hb_remove_previews( h ); +} - /* Remove temp folder */ - dir = opendir( dirname ); - if (dir) +/** + * Redirects stderr to the registered callback + * function. + * @param _data Unused. + */ +static void redirect_thread_func(void * _data) +{ + int pfd[2]; + pipe(pfd); +#if defined( SYS_MINGW ) + // dup2 doesn't work on windows for some stupid reason + stderr->_file = pfd[1]; +#else + dup2(pfd[1], /*stderr*/ 2); +#endif + FILE * log_f = fdopen(pfd[0], "rb"); + + char line_buffer[500]; + while(fgets(line_buffer, 500, log_f) != NULL) { - while( ( entry = readdir( dir ) ) ) - { - char filename[1024]; - if( entry->d_name[0] == '.' ) - { - continue; - } - memset( filename, 0, 1024 ); - snprintf( filename, 1023, "%s/%s", dirname, entry->d_name ); - unlink( filename ); - } - closedir( dir ); - rmdir( dirname ); + hb_log_callback(line_buffer); } } @@ -1445,6 +1793,39 @@ int hb_get_pid( hb_handle_t * h ) } /** + * Returns the id for the given instance. + * @param h Handle to hb_handle_t + * @returns The ID for the given instance + */ +int hb_get_instance_id( hb_handle_t * h ) +{ + return h->id; +} + +/** + * Returns the title with the given title index. + * @param h Handle to hb_handle_t + * @param title_index the index of the title to get + * @returns The requested title + */ +hb_title_t * hb_get_title_by_index( hb_handle_t * h, int title_index ) +{ + hb_title_t * title; + int i; + int count = hb_list_count( h->list_title ); + for (i = 0; i < count; i++) + { + title = hb_list_item( h->list_title, i ); + if (title->index == title_index) + { + return title; + } + } + + return NULL; +} + +/** * Sets the current state. * @param h Handle to hb_handle_t * @param s Handle to new hb_state_t @@ -1454,7 +1835,8 @@ void hb_set_state( hb_handle_t * h, hb_state_t * s ) hb_lock( h->pause_lock ); hb_lock( h->state_lock ); memcpy( &h->state, s, sizeof( hb_state_t ) ); - if( h->state.state == HB_STATE_WORKING ) + if( h->state.state == HB_STATE_WORKING || + h->state.state == HB_STATE_SEARCHING ) { /* XXX Hack */ if (h->job_count < 1)