Skip to content

GitLab

Commit 8b6df37d authored by Guillaume Poirier's avatar Guillaume Poirier
Browse files
Options

Fix define of illegal function identifiers (as defined in section "7.1.3... 

Fix define of illegal function identifiers (as defined in section "7.1.3 Reserved identiers" of C99 spec)
parent e0d72e3d
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 130 deletions
gtk/x264_gtk.c
View file @ 8b6df37d
......@@ -35,17 +35,17 @@
#define X264_MIN(a,b) ( (a)<(b) ? (a) : (b) )
/* Callbacks */
static void _dialog_run (GtkDialog *dialog,
static void x264_dialog_run (GtkDialog *dialog,
gint response,
X264_Gui_Config *gconfig,
X264_Gtk *x264_gtk);
/* x264 config management */
static void _default_load (GtkButton *button, gpointer user_data);
static void _current_get (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk);
static void _current_set (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk);
static void _default_set (X264_Gtk *x264_gtk);
static void x264_default_load (GtkButton *button, gpointer user_data);
static void x264_current_get (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk);
static void x264_current_set (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk);
static void x264_default_set (X264_Gtk *x264_gtk);
/* Result must be freed */
......@@ -192,7 +192,7 @@ x264_gtk_load (void)
if (error) {
g_print (_("x264.cfg: %s\n"), error->message);
g_print (_("Loading default configuration\n"));
_default_set (x264_gtk);
x264_default_set (x264_gtk);
}
else {
GIOStatus status;
......@@ -244,7 +244,7 @@ x264_gtk_window_create (GtkWidget *parent)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (win_x264_gtk)->action_area), button, FALSE, TRUE, 6);
g_signal_connect (G_OBJECT (button),
"clicked",
G_CALLBACK (_default_load),
G_CALLBACK (x264_default_load),
gconfig);
gtk_widget_show (button);
......@@ -264,42 +264,42 @@ x264_gtk_window_create (GtkWidget *parent)
label = gtk_label_new (_("Bitrate"));
gtk_widget_show (label);
page = _bitrate_page (gconfig);
page = x264_bitrate_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("Rate Control"));
gtk_widget_show (label);
page = _rate_control_page (gconfig);
page = x264_rate_control_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("MB & Frames"));
gtk_widget_show (label);
page = _mb_page (gconfig);
page = x264_mb_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("More..."));
gtk_widget_show (label);
page = _more_page (gconfig);
page = x264_more_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("Quantization matrices"));
gtk_widget_show (label);
page = _cqm_page (gconfig);
page = x264_cqm_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
_current_set (gconfig, x264_gtk);
x264_current_set (gconfig, x264_gtk);
result = gtk_dialog_run (GTK_DIALOG (win_x264_gtk));
_dialog_run (GTK_DIALOG (win_x264_gtk), result, gconfig, x264_gtk);
x264_dialog_run (GTK_DIALOG (win_x264_gtk), result, gconfig, x264_gtk);
return win_x264_gtk;
}
......@@ -330,7 +330,7 @@ x264_gtk_free (X264_Gtk *x264_gtk)
/* Callbacks */
static void
_dialog_run (GtkDialog *dialog UNUSED,
x264_dialog_run (GtkDialog *dialog UNUSED,
gint response,
X264_Gui_Config *gconfig,
X264_Gtk *x264_gtk)
......@@ -369,7 +369,7 @@ _dialog_run (GtkDialog *dialog UNUSED,
file = g_io_channel_new_file (filename, "w+", NULL);
if (file)
{
_current_get (gconfig, x264_gtk);
x264_current_get (gconfig, x264_gtk);
g_io_channel_set_encoding (file, NULL, NULL);
g_io_channel_write_chars (file, (const gchar *)x264_gtk,
sizeof (X264_Gtk), &length, NULL);
......@@ -382,7 +382,7 @@ _dialog_run (GtkDialog *dialog UNUSED,
/* x264 config management */
static void
_default_load (GtkButton *button UNUSED, gpointer user_data)
x264_default_load (GtkButton *button UNUSED, gpointer user_data)
{
gchar buf[64];
X264_Gui_Config *config;
......@@ -528,7 +528,7 @@ _default_load (GtkButton *button UNUSED, gpointer user_data)
}
static void
_default_set (X264_Gtk *x264_gtk)
x264_default_set (X264_Gtk *x264_gtk)
{
x264_param_t param;
......@@ -625,7 +625,7 @@ _default_set (X264_Gtk *x264_gtk)
}
static void
_current_set (X264_Gui_Config *config, X264_Gtk *x264_gtk)
x264_current_set (X264_Gui_Config *config, X264_Gtk *x264_gtk)
{
gchar buf[4096];
gint i;
......@@ -830,7 +830,7 @@ _current_set (X264_Gui_Config *config, X264_Gtk *x264_gtk)
}
static void
_current_get (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk)
x264_current_get (X264_Gui_Config *gconfig, X264_Gtk *x264_gtk)
{
const gchar *text;
gint i;
......
gtk/x264_gtk_bitrate.c
View file @ 8b6df37d
......@@ -13,13 +13,13 @@
/* Callbacks */
static void _bitrate_pass (GtkComboBox *combo,
static void x264_bitrate_pass (GtkComboBox *combo,
gpointer user_data);
static void _bitrate_statfile (GtkToggleButton *button,
static void x264_bitrate_statfile (GtkToggleButton *button,
gpointer user_data);
GtkWidget *
_bitrate_page (X264_Gui_Config *gconfig)
x264_bitrate_page (X264_Gui_Config *gconfig)
{
GtkWidget *vbox;
GtkWidget *frame;
......@@ -78,7 +78,7 @@ _bitrate_page (X264_Gui_Config *gconfig)
1, 2, 0, 1);
g_signal_connect (G_OBJECT (gconfig->bitrate.pass),
"changed",
G_CALLBACK (_bitrate_pass),
G_CALLBACK (x264_bitrate_pass),
gconfig);
gtk_widget_show (gconfig->bitrate.pass);
......@@ -127,7 +127,7 @@ _bitrate_page (X264_Gui_Config *gconfig)
"");
g_signal_connect (G_OBJECT (gconfig->bitrate.update_statfile),
"toggled",
G_CALLBACK (_bitrate_statfile), gconfig);
G_CALLBACK (x264_bitrate_statfile), gconfig);
gtk_table_attach_defaults (GTK_TABLE (table), gconfig->bitrate.update_statfile,
0, 1, 0, 1);
gtk_widget_show (gconfig->bitrate.update_statfile);
......@@ -148,7 +148,7 @@ _bitrate_page (X264_Gui_Config *gconfig)
/* Callbacks */
static void
_bitrate_pass (GtkComboBox *combo,
x264_bitrate_pass (GtkComboBox *combo,
gpointer user_data)
{
X264_Gui_Config *gconfig;
......@@ -202,7 +202,7 @@ _bitrate_pass (GtkComboBox *combo,
}
static void
_bitrate_statfile (GtkToggleButton *button,
x264_bitrate_statfile (GtkToggleButton *button,
gpointer user_data)
{
X264_Gui_Config *gconfig;
......
gtk/x264_gtk_bitrate.h
View file @ 8b6df37d
......@@ -2,7 +2,7 @@
#define X264_GTK_BITRATE_H
GtkWidget *_bitrate_page (X264_Gui_Config *config);
GtkWidget *x264_bitrate_page (X264_Gui_Config *config);
#endif /* X264_GTK_BITRATE_H */
gtk/x264_gtk_cqm.c
View file @ 8b6df37d
......@@ -13,23 +13,23 @@
/* Callbacks */
static void _cqm_flat_matrix_cb (GtkToggleButton *togglebutton,
static void x264_cqm_flat_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data);
static void _cqm_jvt_matrix_cb (GtkToggleButton *togglebutton,
static void x264_cqm_jvt_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data);
static void _cqm_custom_matrix_cb (GtkToggleButton *togglebutton,
static void x264_cqm_custom_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data);
static void _cqm_matrix_file_cb (GtkFileChooser *filechooser,
static void x264_cqm_matrix_file_cb (GtkFileChooser *filechooser,
gint response,
gpointer user_data);
static GtkWidget *_cqm_4x4_page (X264_Gui_Config *gconfig);
static GtkWidget *_cqm_8x8_iy_page (X264_Gui_Config *gconfig);
static GtkWidget *_cqm_8x8_py_page (X264_Gui_Config *gconfig);
static GtkWidget *x264_cqm_4x4_page (X264_Gui_Config *gconfig);
static GtkWidget *x264_cqm_8x8_iy_page (X264_Gui_Config *gconfig);
static GtkWidget *x264_cqm_8x8_py_page (X264_Gui_Config *gconfig);
GtkWidget *
_cqm_page (X264_Gui_Config *gconfig)
x264_cqm_page (X264_Gui_Config *gconfig)
{
GtkWidget *vbox;
GtkWidget *table;
......@@ -58,7 +58,7 @@ _cqm_page (X264_Gui_Config *gconfig)
gtk_table_attach_defaults (GTK_TABLE (table), gconfig->cqm.radio_flat,
0, 1, 0, 1);
g_signal_connect (G_OBJECT (gconfig->cqm.radio_flat), "toggled",
G_CALLBACK (_cqm_flat_matrix_cb), gconfig);
G_CALLBACK (x264_cqm_flat_matrix_cb), gconfig);
gtk_widget_show (gconfig->cqm.radio_flat);
gconfig->cqm.radio_jvt = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (gconfig->cqm.radio_flat), _("JVT matrix"));
......@@ -68,7 +68,7 @@ _cqm_page (X264_Gui_Config *gconfig)
gtk_table_attach_defaults (GTK_TABLE (table), gconfig->cqm.radio_jvt,
0, 1, 1, 2);
g_signal_connect (G_OBJECT (gconfig->cqm.radio_jvt), "toggled",
G_CALLBACK (_cqm_jvt_matrix_cb), gconfig);
G_CALLBACK (x264_cqm_jvt_matrix_cb), gconfig);
gtk_widget_show (gconfig->cqm.radio_jvt);
gconfig->cqm.radio_custom = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (gconfig->cqm.radio_flat), _("Custom matrix"));
......@@ -78,7 +78,7 @@ _cqm_page (X264_Gui_Config *gconfig)
gtk_table_attach_defaults (GTK_TABLE (table), gconfig->cqm.radio_custom,
0, 1, 2, 3);
g_signal_connect (G_OBJECT (gconfig->cqm.radio_custom), "toggled",
G_CALLBACK (_cqm_custom_matrix_cb), gconfig);
G_CALLBACK (x264_cqm_custom_matrix_cb), gconfig);
gtk_widget_show (gconfig->cqm.radio_custom);
chooser = gtk_file_chooser_dialog_new(_("Select a file"),
......@@ -88,7 +88,7 @@ _cqm_page (X264_Gui_Config *gconfig)
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
g_signal_connect (G_OBJECT (chooser), "response",
G_CALLBACK (_cqm_matrix_file_cb), gconfig);
G_CALLBACK (x264_cqm_matrix_file_cb), gconfig);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
g_get_home_dir ());
gconfig->cqm.cqm_file = gtk_file_chooser_button_new_with_dialog (chooser);
......@@ -104,21 +104,21 @@ _cqm_page (X264_Gui_Config *gconfig)
label = gtk_label_new (_("4x4 quant. matrices"));
gtk_widget_show (label);
page = _cqm_4x4_page (gconfig);
page = x264_cqm_4x4_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("8x8 I luma quant. matrices"));
gtk_widget_show (label);
page = _cqm_8x8_iy_page (gconfig);
page = x264_cqm_8x8_iy_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
label = gtk_label_new (_("8x8 P luma quant. matrices"));
gtk_widget_show (label);
page = _cqm_8x8_py_page (gconfig);
page = x264_cqm_8x8_py_page (gconfig);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
gtk_widget_show (page);
......@@ -126,7 +126,7 @@ _cqm_page (X264_Gui_Config *gconfig)
}
static GtkWidget *
_cqm_4x4_page (X264_Gui_Config *gconfig)
x264_cqm_4x4_page (X264_Gui_Config *gconfig)
{
GtkWidget *table;
GtkWidget *misc;
......@@ -227,7 +227,7 @@ _cqm_4x4_page (X264_Gui_Config *gconfig)
}
static GtkWidget *
_cqm_8x8_iy_page (X264_Gui_Config *gconfig)
x264_cqm_8x8_iy_page (X264_Gui_Config *gconfig)
{
GtkWidget *table;
GtkWidget *misc;
......@@ -254,7 +254,7 @@ _cqm_8x8_iy_page (X264_Gui_Config *gconfig)
}
static GtkWidget *
_cqm_8x8_py_page (X264_Gui_Config *gconfig)
x264_cqm_8x8_py_page (X264_Gui_Config *gconfig)
{
GtkWidget *table;
GtkWidget *misc;
......@@ -282,7 +282,7 @@ _cqm_8x8_py_page (X264_Gui_Config *gconfig)
/* Callbacks */
static void
_cqm_flat_matrix_cb (GtkToggleButton *togglebutton,
x264_cqm_flat_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data)
{
X264_Gui_Config *gconfig;
......@@ -306,7 +306,7 @@ _cqm_flat_matrix_cb (GtkToggleButton *togglebutton,
}
static void
_cqm_jvt_matrix_cb (GtkToggleButton *togglebutton,
x264_cqm_jvt_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data)
{
X264_Gui_Config *gconfig;
......@@ -330,7 +330,7 @@ _cqm_jvt_matrix_cb (GtkToggleButton *togglebutton,
}
static void
_cqm_custom_matrix_cb (GtkToggleButton *togglebutton,
x264_cqm_custom_matrix_cb (GtkToggleButton *togglebutton,
gpointer user_data)
{
X264_Gui_Config *gconfig;
......@@ -354,7 +354,7 @@ _cqm_custom_matrix_cb (GtkToggleButton *togglebutton,
}
static gboolean
_set_coefs (int size, GtkWidget **entries, GIOChannel *file)
x264_set_coefs (int size, GtkWidget **entries, GIOChannel *file)
{
gchar *line;
gsize length;
......@@ -386,7 +386,7 @@ _set_coefs (int size, GtkWidget **entries, GIOChannel *file)
}
static void
_cqm_matrix_file_cb (GtkFileChooser *filechooser,
x264_cqm_matrix_file_cb (GtkFileChooser *filechooser,
gint response,
gpointer user_data)
{
......@@ -419,7 +419,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
}
if (g_str_has_prefix (line, "INTRA4X4_LUMA")) {
g_free (line);
if (!_set_coefs (4, gconfig->cqm.cqm_4iy, file)) {
if (!x264_set_coefs (4, gconfig->cqm.cqm_4iy, file)) {
g_free (filename);
return;
}
......@@ -427,7 +427,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
}
if (g_str_has_prefix (line, "INTRA4X4_CHROMAU")) {
g_free (line);
if (!_set_coefs (4, gconfig->cqm.cqm_4ic, file)) {
if (!x264_set_coefs (4, gconfig->cqm.cqm_4ic, file)) {
g_free (filename);
return;
}
......@@ -435,7 +435,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
}
if (g_str_has_prefix (line, "INTER4X4_LUMA")) {
g_free (line);
if (!_set_coefs (4, gconfig->cqm.cqm_4py, file)) {
if (!x264_set_coefs (4, gconfig->cqm.cqm_4py, file)) {
g_free (filename);
return;
}
......@@ -444,7 +444,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
if (g_str_has_prefix (line, "INTER4X4_CHROMAU")) {
g_free (line);
if (!_set_coefs (4, gconfig->cqm.cqm_4pc, file)) {
if (!x264_set_coefs (4, gconfig->cqm.cqm_4pc, file)) {
g_free (filename);
return;
}
......@@ -452,7 +452,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
}
if (g_str_has_prefix (line, "INTRA8X8_LUMA")) {
g_free (line);
if (!_set_coefs (8, gconfig->cqm.cqm_8iy, file)) {
if (!x264_set_coefs (8, gconfig->cqm.cqm_8iy, file)) {
g_free (filename);
return;
}
......@@ -460,7 +460,7 @@ _cqm_matrix_file_cb (GtkFileChooser *filechooser,
}
if (g_str_has_prefix (line, "INTER8X8_LUMA")) {
g_free (line);
if (!_set_coefs (8, gconfig->cqm.cqm_8py, file)) {
if (!x264_set_coefs (8, gconfig->cqm.cqm_8py, file)) {
g_free (filename);
return;
}
......
gtk/x264_gtk_cqm.h
View file @ 8b6df37d
......@@ -2,7 +2,7 @@
#define X264_GTK_CQM_H
GtkWidget *_cqm_page (X264_Gui_Config *config);
GtkWidget *x264_cqm_page (X264_Gui_Config *config);
#endif /* X264_GTK_CQM_H */
gtk/x264_gtk_encode_encode.c
View file @ 8b6df37d
......@@ -31,8 +31,8 @@ static int (*p_write_nalu) (void *handle, uint8_t *p_nal, int i_size);
static int (*p_set_eop) (void *handle, x264_picture_t *p_picture);
static int (*p_close_outfile) (void *handle);
static int _set_drivers (X264_Demuxer_Type in_container, gint out_container);
static int _encode_frame (x264_t *h, void *handle, x264_picture_t *pic);
static int x264_set_drivers (X264_Demuxer_Type in_container, gint out_container);
static int x264_encode_frame (x264_t *h, void *handle, x264_picture_t *pic);
gpointer
......@@ -57,7 +57,7 @@ x264_gtk_encode_encode (X264_Thread_Data *thread_data)
g_print (_("encoding...\n"));
param = thread_data->param;
err = _set_drivers (thread_data->in_container, thread_data->out_container);
err = x264_set_drivers (thread_data->in_container, thread_data->out_container);
if (err < 0) {
GtkWidget *no_driver;
no_driver = gtk_message_dialog_new (GTK_WINDOW(thread_data->dialog),
......@@ -118,7 +118,7 @@ x264_gtk_encode_encode (X264_Thread_Data *thread_data)
pic.i_pts = (int64_t)i_frame * param->i_fps_den;
i_file += _encode_frame (h, hout, &pic);
i_file += x264_encode_frame (h, hout, &pic);
i_frame++;
......@@ -155,7 +155,7 @@ x264_gtk_encode_encode (X264_Thread_Data *thread_data)
}
/* Flush delayed B-frames */
do {
i_file += i_frame_size = _encode_frame (h, hout, NULL);
i_file += i_frame_size = x264_encode_frame (h, hout, NULL);
} while (i_frame_size);
i_end = x264_mdate ();
......@@ -182,7 +182,7 @@ x264_gtk_encode_encode (X264_Thread_Data *thread_data)
}
static int
_set_drivers (X264_Demuxer_Type in_container, gint out_container)
x264_set_drivers (X264_Demuxer_Type in_container, gint out_container)
{
switch (in_container) {
case X264_DEMUXER_YUV:
......@@ -247,7 +247,7 @@ _set_drivers (X264_Demuxer_Type in_container, gint out_container)
}
static int
_encode_frame (x264_t *h, void *handle, x264_picture_t *pic)
x264_encode_frame (x264_t *h, void *handle, x264_picture_t *pic)
{
x264_picture_t pic_out;
x264_nal_t *nal;
......
gtk/x264_gtk_encode_main_window.c
View file @ 8b6df37d
......@@ -49,26 +49,26 @@ struct X264_Gtk_Encode_
/* Callbacks */
static gboolean _delete_window_cb (GtkWidget *widget,
static gboolean x264_delete_window_cb (GtkWidget *widget,
GdkEvent *event,
gpointer user_data);
static void _configure_window_cb (GtkButton *button,
static void x264_configure_window_cb (GtkButton *button,
gpointer user_data);
static void _chooser_window_cb (GtkDialog *dialog,
static void x264_chooser_window_cb (GtkDialog *dialog,
gint res,
gpointer user_data);
static void _response_window_cb (GtkDialog *dialog,
static void x264_response_window_cb (GtkDialog *dialog,
gint res,
gpointer user_data);
static void _dimension_entry_cb (GtkEditable *editable,
static void x264_dimension_entry_cb (GtkEditable *editable,
gpointer user_data);
static gboolean _fill_status_window (GIOChannel *io,
static gboolean x264_fill_status_window (GIOChannel *io,
GIOCondition condition,
gpointer user_data);
/* Code */
guint64
_file_size(const char* name)
x264_file_size(const char* name)
{
struct stat buf;
memset(&buf, 0, sizeof(struct stat));
......@@ -104,11 +104,11 @@ x264_gtk_encode_main_window ()
gtk_window_set_icon (GTK_WINDOW (dialog), icon);
g_signal_connect (G_OBJECT (dialog),
"delete-event",
G_CALLBACK (_delete_window_cb),
G_CALLBACK (x264_delete_window_cb),
encode);
g_signal_connect (G_OBJECT (dialog),
"response",
G_CALLBACK (_response_window_cb),
G_CALLBACK (x264_response_window_cb),
encode);
encode->main_dialog = dialog;
......@@ -116,7 +116,7 @@ x264_gtk_encode_main_window ()
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 6);
g_signal_connect (G_OBJECT (button),
"clicked",
G_CALLBACK (_configure_window_cb),
G_CALLBACK (x264_configure_window_cb),
dialog);
gtk_widget_show (button);
......@@ -199,7 +199,7 @@ x264_gtk_encode_main_window ()
gtk_file_chooser_add_filter (chooser, filter);
#endif
g_signal_connect_after(G_OBJECT (chooser), "response",
G_CALLBACK (_chooser_window_cb),
G_CALLBACK (x264_chooser_window_cb),
encode);
encode->file_input = gtk_file_chooser_button_new_with_dialog (GTK_WIDGET(chooser));
gtk_table_attach_defaults (GTK_TABLE (table), encode->file_input, 1, 2, 0, 1);
......@@ -213,7 +213,7 @@ x264_gtk_encode_main_window ()
encode->width = gtk_entry_new_with_max_length (255);
gtk_entry_set_text (GTK_ENTRY (encode->width), "352");
g_signal_connect_after(G_OBJECT (encode->width), "changed",
G_CALLBACK (_dimension_entry_cb),
G_CALLBACK (x264_dimension_entry_cb),
encode);
gtk_table_attach_defaults (GTK_TABLE (table), encode->width, 1, 2, 1, 2);
gtk_widget_show (encode->width);
......@@ -227,7 +227,7 @@ x264_gtk_encode_main_window ()
gtk_entry_set_text (GTK_ENTRY (encode->height), "288");
gtk_table_attach_defaults (GTK_TABLE (table), encode->height, 1, 2, 2, 3);
g_signal_connect_after(G_OBJECT (encode->height), "changed",
G_CALLBACK (_dimension_entry_cb),
G_CALLBACK (x264_dimension_entry_cb),
encode);
gtk_widget_show (encode->height);
......@@ -319,7 +319,7 @@ x264_gtk_encode_main_window ()
/* Callbacks */
static void
_encode_shutdown (X264_Gtk_Encode *encode)
x264_encode_shutdown (X264_Gtk_Encode *encode)
{
if (!encode) return;
......@@ -328,18 +328,18 @@ _encode_shutdown (X264_Gtk_Encode *encode)
}
static gboolean
_delete_window_cb (GtkWidget *widget UNUSED,
x264_delete_window_cb (GtkWidget *widget UNUSED,
GdkEvent *event UNUSED,
gpointer user_data)
{
gtk_main_quit ();
_encode_shutdown ((X264_Gtk_Encode *)user_data);
x264_encode_shutdown ((X264_Gtk_Encode *)user_data);
return TRUE;
}
static void
_chooser_window_cb (GtkDialog *dialog,
x264_chooser_window_cb (GtkDialog *dialog,
gint res,
gpointer user_data)
{
......@@ -468,7 +468,7 @@ _chooser_window_cb (GtkDialog *dialog,
gtk_dialog_run (GTK_DIALOG (dialog_message));
gtk_widget_destroy (dialog_message);
}
encode->size = _file_size(in);
encode->size = x264_file_size(in);
if (g_snprintf(buffer, BUFFER_LENGTH, "%i", param.i_width) > 0)
gtk_entry_set_text (GTK_ENTRY (encode->width), buffer);
......@@ -483,7 +483,7 @@ _chooser_window_cb (GtkDialog *dialog,
gtk_entry_set_text (GTK_ENTRY (encode->frame_count), buffer);
}
static void
_dimension_entry_cb (GtkEditable *editable,
x264_dimension_entry_cb (GtkEditable *editable,
gpointer user_data)
{
X264_Gtk_Encode *encode = (X264_Gtk_Encode *)user_data;
......@@ -504,7 +504,7 @@ _dimension_entry_cb (GtkEditable *editable,
}
static void
_configure_window_cb (GtkButton *button UNUSED,
x264_configure_window_cb (GtkButton *button UNUSED,
gpointer user_data)
{
GtkWidget *window;
......@@ -514,7 +514,7 @@ _configure_window_cb (GtkButton *button UNUSED,
}
static void
_response_window_cb (GtkDialog *dialog,
x264_response_window_cb (GtkDialog *dialog,
gint res,
gpointer user_data)
{
......@@ -673,7 +673,7 @@ _response_window_cb (GtkDialog *dialog,
g_io_channel_set_encoding (thread_data->io_write, NULL, NULL);
g_io_add_watch (thread_data->io_read, G_IO_IN,
(GIOFunc)_fill_status_window, thread_data);
(GIOFunc)x264_fill_status_window, thread_data);
win_status = x264_gtk_encode_status_window (thread_data);
gtk_window_set_transient_for (GTK_WINDOW (win_status), GTK_WINDOW (dialog));
......@@ -688,12 +688,12 @@ _response_window_cb (GtkDialog *dialog,