diff options
| -rw-r--r-- | plugins/converter/converter.c | 62 | ||||
| -rw-r--r-- | plugins/converter/converter.glade | 248 | ||||
| -rw-r--r-- | plugins/converter/converter.h | 2 | ||||
| -rw-r--r-- | plugins/converter/convgui.c | 73 | ||||
| -rw-r--r-- | plugins/converter/interface.c | 102 |
5 files changed, 11 insertions, 476 deletions
diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c index 70a7314e..99d3b04b 100644 --- a/plugins/converter/converter.c +++ b/plugins/converter/converter.c @@ -99,12 +99,6 @@ encoder_preset_load (const char *fname) { else if (!strcmp (str, "method")) { p->method = atoi (item); } - else if (!strcmp (str, "formats")) { - sscanf (item, "%X", &p->formats); - } - else if (!strcmp (str, "defaultfmt")) { - sscanf (item, "%X", &p->default_format); - } else if (!strcmp (str, "id3v2_version")) { p->id3v2_version = atoi (item); } @@ -181,8 +175,6 @@ encoder_preset_save (ddb_encoder_preset_t *p, int overwrite) { fprintf (fp, "ext %s\n", p->ext); fprintf (fp, "encoder %s\n", p->encoder); fprintf (fp, "method %d\n", p->method); - fprintf (fp, "formats %08X\n", p->formats); - fprintf (fp, "defaultfmt %08X\n", p->default_format); fprintf (fp, "id3v2_version %d\n", p->id3v2_version); fprintf (fp, "tag_id3v2 %d\n", p->tag_id3v2); fprintf (fp, "tag_id3v1 %d\n", p->tag_id3v1); @@ -200,8 +192,6 @@ encoder_preset_copy (ddb_encoder_preset_t *to, ddb_encoder_preset_t *from) { to->ext = strdup (from->ext); to->encoder = strdup (from->encoder); to->method = from->method; - to->formats = from->formats; - to->default_format = from->default_format; to->tag_id3v2 = from->tag_id3v2; to->tag_id3v1 = from->tag_id3v1; to->tag_apev2 = from->tag_apev2; @@ -533,6 +523,7 @@ convert (DB_playItem_t *it, const char *outfolder, const char *outfile, int outp char out[PATH_MAX] = ""; // full path to output file char input_file_name[PATH_MAX] = ""; dec = (DB_decoder_t *)deadbeef->plug_get_for_id (deadbeef->pl_find_meta (it, ":DECODER")); + if (dec) { fileinfo = dec->open (0); if (fileinfo && dec->init (fileinfo, DB_PLAYITEM (it)) != 0) { @@ -542,6 +533,11 @@ convert (DB_playItem_t *it, const char *outfolder, const char *outfile, int outp goto error; } if (fileinfo) { + if (output_bps == -1) { + output_bps = fileinfo->fmt.bps; + output_is_float = fileinfo->fmt.is_float; + } + get_output_path (it, outfolder, outfile, encoder_preset, out, sizeof (out)); if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) { const char *tmp = getenv ("TMPDIR"); @@ -636,52 +632,6 @@ convert (DB_playItem_t *it, const char *outfolder, const char *outfile, int outp uint32_t outsr = fileinfo->fmt.samplerate; uint16_t outch = fileinfo->fmt.channels; - if (!(encoder_preset->formats & encoder_preset->default_format)) { - fprintf (stderr, "converter: invalid default format in the encoder preset '%s', formats: %X, def: %X\n", encoder_preset->title, encoder_preset->formats, encoder_preset->default_format); - goto error; - } - - // check if encoder supports it - int outfmt = -1; - switch (output_bps) { - case 8: - outfmt = DDB_ENCODER_FMT_8BIT; - break; - case 16: - outfmt = DDB_ENCODER_FMT_16BIT; - break; - case 24: - outfmt = DDB_ENCODER_FMT_24BIT; - break; - case 32: - outfmt = output_is_float ? DDB_ENCODER_FMT_32BITFLOAT : DDB_ENCODER_FMT_32BIT; - break; - } - if (outfmt == -1 || !(encoder_preset->formats & outfmt)) { - // pick default format - outfmt = encoder_preset->default_format; - } - - output_is_float = 0; - switch (outfmt) { - case DDB_ENCODER_FMT_8BIT: - output_bps = 8; - break; - case DDB_ENCODER_FMT_16BIT: - output_bps = 16; - break; - case DDB_ENCODER_FMT_24BIT: - output_bps = 24; - break; - case DDB_ENCODER_FMT_32BIT: - output_bps = 32; - break; - case DDB_ENCODER_FMT_32BITFLOAT: - output_bps = 32; - output_is_float = 1; - break; - } - int samplesize = fileinfo->fmt.channels * fileinfo->fmt.bps / 8; int bs = 10250 * samplesize; char buffer[bs * 4]; diff --git a/plugins/converter/converter.glade b/plugins/converter/converter.glade index f1a9a17f..fce698c5 100644 --- a/plugins/converter/converter.glade +++ b/plugins/converter/converter.glade @@ -524,7 +524,7 @@ Leave the field empty for default (%a - %t).</property> <child> <widget class="GtkComboBox" id="output_format"> <property name="visible">True</property> - <property name="items" translatable="yes">Auto + <property name="items" translatable="yes">Keep source format 8 bit signed int 16 bit signed int 24 bit signed int @@ -1032,248 +1032,6 @@ Temporary file</property> </child> <child> - <widget class="GtkFrame" id="frame8"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkAlignment" id="alignment20"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox35"> - <property name="border_width">8</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> - - <child> - <widget class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">8</property> - <property name="column_spacing">8</property> - - <child> - <widget class="GtkCheckButton" id="8bit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">8 bit signed int</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="16bit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">16 bit signed int</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="24bit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">24 bit signed int</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="32bit"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">32 bit signed int</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="32bitfloat"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">32 bit float</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox103"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> - - <child> - <widget class="GtkLabel" id="label123"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default format:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="defaultfmt"> - <property name="visible">True</property> - <property name="items" translatable="yes">8 bit signed int -16 bit signed int -24 bit signed int -32 bit signed int -32 bit float</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label118"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Sample formats supported by the encoder</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> <widget class="GtkFrame" id="frame9"> <property name="visible">True</property> <property name="label_xalign">0</property> @@ -1468,8 +1226,8 @@ Temporary file</property> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> diff --git a/plugins/converter/converter.h b/plugins/converter/converter.h index 2218c328..173d35b4 100644 --- a/plugins/converter/converter.h +++ b/plugins/converter/converter.h @@ -46,8 +46,6 @@ typedef struct ddb_encoder_preset_s { char *ext; char *encoder; int method; // pipe or file - uint32_t formats; // combination of supported flags (FMT_*) - uint32_t default_format; int tag_id3v2; int tag_id3v1; int tag_apev2; diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c index 5b5ef5c2..286bfdd4 100644 --- a/plugins/converter/convgui.c +++ b/plugins/converter/convgui.c @@ -557,41 +557,6 @@ init_encoder_preset_from_dlg (GtkWidget *dlg, ddb_encoder_preset_t *p) { break; } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_8bit")))) { - p->formats |= DDB_ENCODER_FMT_8BIT; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_16bit")))) { - p->formats |= DDB_ENCODER_FMT_16BIT; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_24bit")))) { - p->formats |= DDB_ENCODER_FMT_24BIT; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_32bit")))) { - p->formats |= DDB_ENCODER_FMT_32BIT; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_32bitfloat")))) { - p->formats |= DDB_ENCODER_FMT_32BITFLOAT; - } - - int default_fmt = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "defaultfmt"))); - switch (default_fmt) { - case 0: - p->default_format = DDB_ENCODER_FMT_8BIT; - break; - case 1: - p->default_format = DDB_ENCODER_FMT_16BIT; - break; - case 2: - p->default_format = DDB_ENCODER_FMT_24BIT; - break; - case 3: - p->default_format = DDB_ENCODER_FMT_32BIT; - break; - case 4: - p->default_format = DDB_ENCODER_FMT_32BITFLOAT; - break; - } - p->id3v2_version = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "id3v2_version"))); p->tag_id3v2 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "id3v2"))); p->tag_id3v1 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "id3v1"))); @@ -620,42 +585,6 @@ edit_encoder_preset (char *title, GtkWidget *toplevel, int overwrite) { gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "encoder")), p->encoder); } gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "method")), p->method); - if (p->formats & DDB_ENCODER_FMT_8BIT) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_8bit")), 1); - } - if (p->formats & DDB_ENCODER_FMT_16BIT) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_16bit")), 1); - } - if (p->formats & DDB_ENCODER_FMT_24BIT) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_24bit")), 1); - } - if (p->formats & DDB_ENCODER_FMT_32BIT) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_32bit")), 1); - } - if (p->formats & DDB_ENCODER_FMT_32BITFLOAT) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "_32bitfloat")), 1); - } - int default_fmt = -1; - switch (p->default_format) { - case DDB_ENCODER_FMT_8BIT: - default_fmt = 0; - break; - case DDB_ENCODER_FMT_16BIT: - default_fmt = 1; - break; - case DDB_ENCODER_FMT_24BIT: - default_fmt = 2; - break; - case DDB_ENCODER_FMT_32BIT: - default_fmt = 3; - break; - case DDB_ENCODER_FMT_32BITFLOAT: - default_fmt = 4; - break; - } - if (default_fmt != -1) { - gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "defaultfmt")), default_fmt); - } gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id3v2_version")), p->id3v2_version); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "id3v2")), p->tag_id3v2); @@ -744,8 +673,6 @@ on_encoder_preset_add (GtkButton *button, GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button)); current_ctx->current_encoder_preset = converter_plugin->encoder_preset_alloc (); - current_ctx->current_encoder_preset->formats = DDB_ENCODER_FMT_16BIT; - current_ctx->current_encoder_preset->default_format = DDB_ENCODER_FMT_16BIT; if (GTK_RESPONSE_OK == edit_encoder_preset (_("Add new encoder"), toplevel, 0)) { printf ("added new enc preset\n"); diff --git a/plugins/converter/interface.c b/plugins/converter/interface.c index 64f2ba74..5045a79d 100644 --- a/plugins/converter/interface.c +++ b/plugins/converter/interface.c @@ -206,7 +206,7 @@ create_converterdlg (void) output_format = gtk_combo_box_new_text (); gtk_widget_show (output_format); gtk_box_pack_start (GTK_BOX (hbox89), output_format, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("Auto")); + gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("Keep source format")); gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("8 bit signed int")); gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("16 bit signed int")); gtk_combo_box_append_text (GTK_COMBO_BOX (output_format), _("24 bit signed int")); @@ -364,19 +364,6 @@ create_convpreset_editor (void) GtkWidget *hbox73; GtkWidget *label107; GtkWidget *method; - GtkWidget *frame8; - GtkWidget *alignment20; - GtkWidget *vbox35; - GtkWidget *table1; - GtkWidget *_8bit; - GtkWidget *_16bit; - GtkWidget *_24bit; - GtkWidget *_32bit; - GtkWidget *_32bitfloat; - GtkWidget *hbox103; - GtkWidget *label123; - GtkWidget *defaultfmt; - GtkWidget *label118; GtkWidget *frame9; GtkWidget *alignment21; GtkWidget *table2; @@ -482,81 +469,9 @@ create_convpreset_editor (void) gtk_combo_box_append_text (GTK_COMBO_BOX (method), _("Pipe")); gtk_combo_box_append_text (GTK_COMBO_BOX (method), _("Temporary file")); - frame8 = gtk_frame_new (NULL); - gtk_widget_show (frame8); - gtk_box_pack_start (GTK_BOX (vbox27), frame8, TRUE, TRUE, 0); - - alignment20 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment20); - gtk_container_add (GTK_CONTAINER (frame8), alignment20); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment20), 0, 0, 12, 0); - - vbox35 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox35); - gtk_container_add (GTK_CONTAINER (alignment20), vbox35); - gtk_container_set_border_width (GTK_CONTAINER (vbox35), 8); - - table1 = gtk_table_new (3, 2, FALSE); - gtk_widget_show (table1); - gtk_box_pack_start (GTK_BOX (vbox35), table1, FALSE, TRUE, 0); - gtk_table_set_row_spacings (GTK_TABLE (table1), 8); - gtk_table_set_col_spacings (GTK_TABLE (table1), 8); - - _8bit = gtk_check_button_new_with_mnemonic (_("8 bit signed int")); - gtk_widget_show (_8bit); - gtk_table_attach (GTK_TABLE (table1), _8bit, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - _16bit = gtk_check_button_new_with_mnemonic (_("16 bit signed int")); - gtk_widget_show (_16bit); - gtk_table_attach (GTK_TABLE (table1), _16bit, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - _24bit = gtk_check_button_new_with_mnemonic (_("24 bit signed int")); - gtk_widget_show (_24bit); - gtk_table_attach (GTK_TABLE (table1), _24bit, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - _32bit = gtk_check_button_new_with_mnemonic (_("32 bit signed int")); - gtk_widget_show (_32bit); - gtk_table_attach (GTK_TABLE (table1), _32bit, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - _32bitfloat = gtk_check_button_new_with_mnemonic (_("32 bit float")); - gtk_widget_show (_32bitfloat); - gtk_table_attach (GTK_TABLE (table1), _32bitfloat, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - hbox103 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox103); - gtk_box_pack_start (GTK_BOX (vbox35), hbox103, FALSE, TRUE, 0); - - label123 = gtk_label_new (_("Default format:")); - gtk_widget_show (label123); - gtk_box_pack_start (GTK_BOX (hbox103), label123, FALSE, FALSE, 0); - - defaultfmt = gtk_combo_box_new_text (); - gtk_widget_show (defaultfmt); - gtk_box_pack_start (GTK_BOX (hbox103), defaultfmt, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (defaultfmt), _("8 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (defaultfmt), _("16 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (defaultfmt), _("24 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (defaultfmt), _("32 bit signed int")); - gtk_combo_box_append_text (GTK_COMBO_BOX (defaultfmt), _("32 bit float")); - - label118 = gtk_label_new (_("<b>Sample formats supported by the encoder</b>")); - gtk_widget_show (label118); - gtk_frame_set_label_widget (GTK_FRAME (frame8), label118); - gtk_label_set_use_markup (GTK_LABEL (label118), TRUE); - frame9 = gtk_frame_new (NULL); gtk_widget_show (frame9); - gtk_box_pack_start (GTK_BOX (vbox27), frame9, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox27), frame9, FALSE, FALSE, 0); alignment21 = gtk_alignment_new (0.5, 0.5, 1, 1); gtk_widget_show (alignment21); @@ -651,19 +566,6 @@ create_convpreset_editor (void) GLADE_HOOKUP_OBJECT (convpreset_editor, hbox73, "hbox73"); GLADE_HOOKUP_OBJECT (convpreset_editor, label107, "label107"); GLADE_HOOKUP_OBJECT (convpreset_editor, method, "method"); - GLADE_HOOKUP_OBJECT (convpreset_editor, frame8, "frame8"); - GLADE_HOOKUP_OBJECT (convpreset_editor, alignment20, "alignment20"); - GLADE_HOOKUP_OBJECT (convpreset_editor, vbox35, "vbox35"); - GLADE_HOOKUP_OBJECT (convpreset_editor, table1, "table1"); - GLADE_HOOKUP_OBJECT (convpreset_editor, _8bit, "_8bit"); - GLADE_HOOKUP_OBJECT (convpreset_editor, _16bit, "_16bit"); - GLADE_HOOKUP_OBJECT (convpreset_editor, _24bit, "_24bit"); - GLADE_HOOKUP_OBJECT (convpreset_editor, _32bit, "_32bit"); - GLADE_HOOKUP_OBJECT (convpreset_editor, _32bitfloat, "_32bitfloat"); - GLADE_HOOKUP_OBJECT (convpreset_editor, hbox103, "hbox103"); - GLADE_HOOKUP_OBJECT (convpreset_editor, label123, "label123"); - GLADE_HOOKUP_OBJECT (convpreset_editor, defaultfmt, "defaultfmt"); - GLADE_HOOKUP_OBJECT (convpreset_editor, label118, "label118"); GLADE_HOOKUP_OBJECT (convpreset_editor, frame9, "frame9"); GLADE_HOOKUP_OBJECT (convpreset_editor, alignment21, "alignment21"); GLADE_HOOKUP_OBJECT (convpreset_editor, table2, "table2"); |