← Back to branch summary

~ubuntu-branches/ubuntu/precise/flac/precise-updates

« back to all changes in this revision

Viewing changes to src/plugin_xmms/configure.c

  • Committer: Bazaar Package Importer
  • Author(s): Joshua Kwan
  • Date: 2007-05-29 22:56:36 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070529225636-ljeff8xxip09qaap
Tags: 1.1.4-1
http://bugs.debian.org/405167
http://bugs.debian.org/411311
* New upstream release. closes: #405167, #411311
  - libOggFLAC and libOggFLAC++ have been merged into libFLAC, so
    remove their corresponding packages.
  - Because of the API changes required to effect the above, there has
    been yet another soname bump. libflac7 -> libflac8 and
    libflac++5 -> libflac++6. Emails have been dispatched to the
    maintainers of dependent packages.
* Some notes on patches that were removed:
  - 02_stdin_stdout, 06_manpage_mention_utf8_convert: merged upstream
  - 08_manpage_warnings: Upstream has changed the manpage so it defintely
    can't fit in in 80 cols, so just forget about it. We'll live.
  - 05_eof_warnings_are_errors: Upstream decided to add a -w option to
    flac to treat all warnings as errors. I am going to defer to that
    for now, but if people think it's stupid let me know and I'll port
    the patch forward.
  - 04_stack_smasher: was a backport from 1.1.3, so it's obsolete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin_xmms/configure.c
1
1
/* libxmms-flac - XMMS FLAC input plugin
2
 
 * Copyright (C) 2002,2003,2004,2005  Daisuke Shimamura
 
2
 * Copyright (C) 2002,2003,2004,2005,2006  Daisuke Shimamura
3
3
 *
4
4
 * Based on mpg123 plugin
5
5
 *          and prefs.c - 2000/05/06
21
21
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
22
22
 */
23
23
 
 
24
#if HAVE_CONFIG_H
 
25
#  include <config.h>
 
26
#endif
 
27
 
24
28
#include <stdlib.h>
25
29
#include <string.h>
26
30
#include <glib.h>
34
38
#include <xmms/util.h>
35
39
#include <xmms/plugin.h>
36
40
 
37
 
#include "plugin_common/locale_hack.h"
38
41
#include "share/replaygain_synthesis.h" /* for NOISE_SHAPING_LOW */
39
42
#include "charset.h"
40
43
#include "configure.h"
 
44
#include "locale_hack.h"
41
45
 
42
46
/*
43
47
 * Initialize Global Valueable
55
59
                100 /* KB */, /* http_buffer_size */
56
60
                50, /* http_prebuffer */
57
61
                FALSE, /* use_proxy */
58
 
                "", /* proxy_host */
 
62
                NULL, /* proxy_host */
59
63
                0, /* proxy_port */
60
64
                FALSE, /* proxy_use_auth */
61
 
                "", /* proxy_user */
62
 
                "", /* proxy_pass */
 
65
                NULL, /* proxy_user */
 
66
                NULL, /* proxy_pass */
63
67
                FALSE, /* save_http_stream */
64
 
                "", /* save_http_path */
 
68
                NULL, /* save_http_path */
65
69
                FALSE, /* cast_title_streaming */
66
70
                FALSE /* use_udp_channel */
67
71
        },
159
163
        flac_cfg.stream.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
160
164
 
161
165
        flac_cfg.stream.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
162
 
        g_free(flac_cfg.stream.proxy_host);
 
166
        if(flac_cfg.stream.proxy_host)
 
167
                g_free(flac_cfg.stream.proxy_host);
163
168
        flac_cfg.stream.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
164
169
        flac_cfg.stream.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
165
170
 
380
385
        GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
381
386
        GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
382
387
        GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
383
 
        GtkWidget *streaming_proxy_port_label,  *streaming_proxy_host_label;
 
388
        GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
384
389
        GtkWidget *streaming_save_frame, *streaming_save_vbox;
385
390
        GtkWidget *streaming_save_label, *streaming_save_browse;
386
391
#ifdef FLAC_ICECAST
666
671
        gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
667
672
 
668
673
        streaming_proxy_host_entry = gtk_entry_new();
669
 
        gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
 
674
        gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host? flac_cfg.stream.proxy_host : "");
670
675
        gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
671
676
 
672
677
        streaming_proxy_port_label = gtk_label_new(_("Port:"));
731
736
        gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
732
737
 
733
738
        streaming_save_entry = gtk_entry_new();
734
 
        gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
 
739
        gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path? flac_cfg.stream.save_http_path : "");
735
740
        gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
736
741
 
737
742
        streaming_save_browse = gtk_button_new_with_label(_("Browse"));
778
783
        gtk_widget_show_all(flac_configurewin);
779
784
}
780
785
 
781
 
void FLAC_XMMS__aboutbox()
 
786
void FLAC_XMMS__aboutbox(void)
782
787
{
783
788
        static GtkWidget *about_window;
784
789