OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: merge gtk mingw cross compiling support
[handbrake-jp/handbrake-jp-git.git]
/
gtk
/
src
/
queuehandler.c
diff --git
a/gtk/src/queuehandler.c
b/gtk/src/queuehandler.c
index
2039b5e
..
aed2b07
100644
(file)
--- a/
gtk/src/queuehandler.c
+++ b/
gtk/src/queuehandler.c
@@
-23,7
+23,7
@@
#include "presets.h"
#include "ghb-dvd.h"
#include "presets.h"
#include "ghb-dvd.h"
-void
+
G_MODULE_EXPORT
void
queue_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
{
GtkTreeModel *store;
queue_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
{
GtkTreeModel *store;
@@
-72,7
+72,8
@@
add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
gchar *fps, *vcodec_abbr;
gint title, start_chapter, end_chapter, width, height;
gint source_width, source_height;
gchar *fps, *vcodec_abbr;
gint title, start_chapter, end_chapter, width, height;
gint source_width, source_height;
- gboolean pass2, anamorphic, round_dim, keep_aspect, vqtype, turbo;
+ gboolean pass2, keep_aspect, vqtype, turbo;
+ gint pic_par;
gboolean tweaks;
gchar *escape;
gboolean tweaks;
gchar *escape;
@@
-186,23
+187,13
@@
add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
width = ghb_settings_get_int(settings, "scale_width");
height = ghb_settings_get_int(settings, "scale_height");
width = ghb_settings_get_int(settings, "scale_width");
height = ghb_settings_get_int(settings, "scale_height");
- anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
- round_dim = ghb_settings_get_boolean(settings, "ModDimensions");
+ pic_par = ghb_settings_combo_int(settings, "PicturePAR");
keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
gchar *aspect_desc;
keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
gchar *aspect_desc;
-
if (anamorphic
)
+
switch (pic_par
)
{
{
- if (round_dim)
- {
- aspect_desc = "(Anamorphic)";
- }
- else
- {
- aspect_desc = "(Strict Anamorphic)";
- }
- }
- else
+ case 0:
{
if (keep_aspect)
{
{
if (keep_aspect)
{
@@
-212,6
+203,27
@@
add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
{
aspect_desc = "(Aspect Lost)";
}
{
aspect_desc = "(Aspect Lost)";
}
+ } break;
+
+ case 1:
+ {
+ aspect_desc = "(Strict Anamorphic)";
+ } break;
+
+ case 2:
+ {
+ aspect_desc = "(Loose Anamorphic)";
+ } break;
+
+ case 3:
+ {
+ aspect_desc = "(Custom Anamorphic)";
+ } break;
+
+ default:
+ {
+ aspect_desc = "(Unknown)";
+ } break;
}
vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
}
vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
@@
-640,6
+652,12
@@
queue_add(signal_user_data_t *ud)
{
return FALSE;
}
{
return FALSE;
}
+
+ GtkStatusIcon *si;
+
+ si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+ gtk_status_icon_set_from_icon_name(si, "hb-status");
+
if (ud->queue == NULL)
ud->queue = ghb_array_value_new(32);
// Make a copy of current settings to be used for the new job
if (ud->queue == NULL)
ud->queue = ghb_array_value_new(32);
// Make a copy of current settings to be used for the new job
@@
-656,14
+674,14
@@
queue_add(signal_user_data_t *ud)
return TRUE;
}
return TRUE;
}
-void
+
G_MODULE_EXPORT
void
queue_add_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
{
g_debug("queue_add_clicked_cb ()");
queue_add(ud);
}
queue_add_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
{
g_debug("queue_add_clicked_cb ()");
queue_add(ud);
}
-void
+
G_MODULE_EXPORT
void
queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
{
GtkTreeView *treeview;
queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
{
GtkTreeView *treeview;
@@
-743,7
+761,7
@@
find_last_finished(GValue *queue)
// handler from expanding rows if you hover over them while
// dragging.
// Also controls where valid drop locations are
// handler from expanding rows if you hover over them while
// dragging.
// Also controls where valid drop locations are
-gboolean
+
G_MODULE_EXPORT
gboolean
queue_drag_motion_cb(
GtkTreeView *tv,
GdkDragContext *ctx,
queue_drag_motion_cb(
GtkTreeView *tv,
GdkDragContext *ctx,
@@
-821,7
+839,7
@@
queue_drag_motion_cb(
return TRUE;
}
return TRUE;
}
-void
+
G_MODULE_EXPORT
void
queue_drag_cb(
GtkTreeView *dstwidget,
GdkDragContext *dc,
queue_drag_cb(
GtkTreeView *dstwidget,
GdkDragContext *dc,
@@
-955,7
+973,7
@@
ghb_queue_buttons_grey(signal_user_data_t *ud, gboolean working)
gtk_action_set_sensitive (action, working);
}
gtk_action_set_sensitive (action, working);
}
-void
+
G_MODULE_EXPORT
void
queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCellRenderer *cell)
{
GtkTreeViewColumn *column;
queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCellRenderer *cell)
{
GtkTreeViewColumn *column;
@@
-970,7
+988,7
@@
queue_list_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, GtkCel
g_object_set(cell, "wrap-width", width-70, NULL);
}
g_object_set(cell, "wrap-width", width-70, NULL);
}
-void
+
G_MODULE_EXPORT
void
queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GValue *js;
queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GValue *js;
@@
-1006,14
+1024,14
@@
queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
}
}
}
}
-void
+
G_MODULE_EXPORT
void
queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
ud->cancel_encode = TRUE;
ghb_cancel_encode(NULL);
}
queue_stop_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
ud->cancel_encode = TRUE;
ghb_cancel_encode(NULL);
}
-void
+
G_MODULE_EXPORT
void
queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
ghb_pause_queue();
queue_pause_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
ghb_pause_queue();
@@
-1089,7
+1107,7
@@
ghb_reload_queue(signal_user_data_t *ud)
return FALSE;
}
return FALSE;
}
-gboolean
+
G_MODULE_EXPORT
gboolean
queue_key_press_cb(
GtkWidget *widget,
GdkEventKey *event,
queue_key_press_cb(
GtkWidget *widget,
GdkEventKey *event,
@@
-1152,7
+1170,7
@@
queue_key_press_cb(
GValue *ghb_queue_edit_settings = NULL;
GValue *ghb_queue_edit_settings = NULL;
-void
+
G_MODULE_EXPORT
void
queue_edit_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GtkTreeView *treeview;
queue_edit_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GtkTreeView *treeview;