summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-03-26 14:54:05 +0000
committerjstebbins <[email protected]>2010-03-26 14:54:05 +0000
commitff1bc2964476e2cbf22ed3dd7aa249a9cc77368b (patch)
tree66d27421270e27e82469b6076fca037e448a68dc /gtk
parent8101df03de52879c876ca73b02a627baa4d09c4a (diff)
make it possible to dynamically create and close multiple libhb instances
tweaks to make libhb more usable from a C# app remove pointers from preview filenames, replaces with hb instance and title id's removes only previews upon hb_close, leaves temp dir for hb_global_close git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3170 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/hb-backend.c7
-rw-r--r--gtk/src/preview.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 49962bd21..53b71fd2d 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1095,14 +1095,14 @@ get_amix_value(gint val)
static hb_handle_t * h_scan = NULL;
static hb_handle_t * h_queue = NULL;
-extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
+extern void hb_get_temporary_directory(char path[512]);
gchar*
ghb_get_tmp_dir()
{
char dir[512];
- hb_get_tempory_directory(h_scan, dir);
+ hb_get_temporary_directory(dir);
return g_strdup(dir);
}
@@ -1111,7 +1111,7 @@ ghb_hb_cleanup(gboolean partial)
{
char dir[512];
- hb_get_tempory_directory(h_scan, dir);
+ hb_get_temporary_directory(dir);
del_tree(dir, !partial);
}
@@ -2948,6 +2948,7 @@ ghb_backend_close()
{
hb_close(&h_queue);
hb_close(&h_scan);
+ hb_global_close();
}
void ghb_backend_scan_stop()
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 2171f8ac8..4ed717bb1 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -533,8 +533,6 @@ ghb_live_reset(signal_user_data_t *ud)
ghb_set_preview_image(ud);
}
-extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
-
G_MODULE_EXPORT void
live_preview_start_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{