← Back to branch summary

~ubuntu-branches/ubuntu/lucid/audacious-plugins/lucid

~ubuntu-branches/ubuntu/lucid/audacious-plugins/lucid

« back to all changes in this revision

Viewing changes to src/modplug/gui/interface.cxx

Committer: Bazaar Package Importer
Author(s): Andreas Moog, Bhavani Shankar, Andreas Moog
Date: 2009-07-23 13:02:52 UTC
mfrom: (1.1.11 upstream) (2.1.3 squeeze)
Revision ID: james.westby@ubuntu.com-20090723130252-88k8ejg21lwmh5ma

Tags: 2.1-1ubuntu1

https://launchpad.net/bugs/399617

https://launchpad.net/bugs/403387

[ Bhavani Shankar ]
* Merge from debian unstable, remaining changes: LP: #399617
  - debian/control:
    + audacious-plugins-extra depends on audacious-plugins
    + audacious-plugins suggests timidiy for midi playback
    + Move PulseAudio from description of extra to main package.
  - debian/rules:
    + Install pulse_audio.so in audacious-plugins dir.
    + Add --disable-arts to ./configure
* Remove debian/patches/cuesheet.patch as its already superceeded in
  debian.

[ Andreas Moog ]
* install /usr/lib/audacious/General/gtkui.so to audacious-plugins.
* Fixes also: LP: #403387

files added:
po/lv.po

src/alsa-ng

src/alsa-ng/Makefile

src/alsa-ng/TODO

src/alsa-ng/alsa-configure.c

src/alsa-ng/alsa-core.c

src/alsa-ng/alsa-debug.h

src/alsa-ng/alsa-ringbuffer.c

src/alsa-ng/alsa-ringbuffer.h

src/alsa-ng/alsa-stdinc.h

src/alsa-ng/alsa-types.h

src/alsa-ng/alsa-util.c

src/bs2b

src/bs2b/Makefile

src/bs2b/plugin.c

src/gtkui

src/gtkui/Makefile

src/gtkui/actions-equalizer.h

src/gtkui/actions-mainwin.h

src/gtkui/actions-playlist.h

src/gtkui/actions.c

src/gtkui/icons-stock.h

src/gtkui/ui_gtk.c

src/gtkui/ui_gtk.h

src/gtkui/ui_manager.c

src/gtkui/ui_manager.h

src/gtkui/ui_playlist_manager.c

src/gtkui/ui_playlist_manager.h

src/gtkui/ui_playlist_widget.c

src/gtkui/ui_playlist_widget.h

src/gtkui/util.c

src/gtkui/util.h

src/psf

src/psf/Makefile

src/psf/README

src/psf/ao.h

src/psf/corlett.c

src/psf/corlett.h

src/psf/cpuintrf.h

src/psf/eng_protos.h

src/psf/eng_psf.c

src/psf/eng_psf2.c

src/psf/eng_spx.c

src/psf/license.txt

src/psf/mamemem.h

src/psf/osd_cpu.h

src/psf/peops

src/psf/peops/License.txt

src/psf/peops/adsr.c

src/psf/peops/adsr.h

src/psf/peops/dma.c

src/psf/peops/dma.h

src/psf/peops/externals.h

src/psf/peops/gauss_i.h

src/psf/peops/registers.c

src/psf/peops/registers.h

src/psf/peops/regs.h

src/psf/peops/reverb.c

src/psf/peops/spu.c

src/psf/peops/spu.h

src/psf/peops/stdafx.h

src/psf/peops2

src/psf/peops2/.DS_Store

src/psf/peops2/License.txt

src/psf/peops2/adsr.c

src/psf/peops2/adsr.h

src/psf/peops2/dma.c

src/psf/peops2/dma.h

src/psf/peops2/externals.h

src/psf/peops2/gauss_i.h

src/psf/peops2/psemuxa.h

src/psf/peops2/registers.c

src/psf/peops2/registers.h

src/psf/peops2/regs.h

src/psf/peops2/reverb.c

src/psf/peops2/reverb.h

src/psf/peops2/spu.c

src/psf/peops2/spu.h

src/psf/peops2/stdafx.h

src/psf/peops2/xa.c

src/psf/plugin.c

src/psf/psx.c

src/psf/psx.h

src/psf/psx_hw.c

src/sid/xs_player.c

files removed:
debian/patches/cuesheet.patch

debian/patches/vorbis-hg-tip.patch

src/alsa

src/alsa/Makefile

src/alsa/about.c

src/alsa/alsa.c

src/alsa/alsa.h

src/alsa/audio.c

src/alsa/configure.c

src/crossfade/convert.c

src/crossfade/convert.h

src/crossfade/format.c

src/crossfade/format.h

src/psf2

src/psf2/Makefile

src/psf2/README

src/psf2/ao.h

src/psf2/corlett.c

src/psf2/corlett.h

src/psf2/cpuintrf.h

src/psf2/eng_protos.h

src/psf2/eng_psf2.c

src/psf2/license.txt

src/psf2/mamemem.h

src/psf2/osd_cpu.h

src/psf2/peops2

src/psf2/peops2/.DS_Store

src/psf2/peops2/License.txt

src/psf2/peops2/adsr.c

src/psf2/peops2/adsr.h

src/psf2/peops2/dma.c

src/psf2/peops2/dma.h

src/psf2/peops2/externals.h

src/psf2/peops2/gauss_i.h

src/psf2/peops2/psemuxa.h

src/psf2/peops2/registers.c

src/psf2/peops2/registers.h

src/psf2/peops2/regs.h

src/psf2/peops2/reverb.c

src/psf2/peops2/reverb.h

src/psf2/peops2/spu.c

src/psf2/peops2/spu.h

src/psf2/peops2/stdafx.h

src/psf2/peops2/xa.c

src/psf2/plugin.c

src/psf2/psx.c

src/psf2/psx.h

src/psf2/psx_hw.c

src/rootvis

src/rootvis/Makefile

src/rootvis/config.h

src/rootvis/config_backend.c

src/rootvis/config_definition.c

src/rootvis/config_frontend.c

src/rootvis/config_frontend.h

src/rootvis/config_frontend_widgets.c

src/rootvis/getroot.c

src/rootvis/rootvis.c

src/rootvis/rootvis.h

src/sexypsf

src/sexypsf/Makefile

src/sexypsf/Misc.c

src/sexypsf/Misc.h

src/sexypsf/PsxBios.c

src/sexypsf/PsxBios.h

src/sexypsf/PsxCommon.h

src/sexypsf/PsxCounters.c

src/sexypsf/PsxCounters.h

src/sexypsf/PsxDma.c

src/sexypsf/PsxDma.h

src/sexypsf/PsxHLE.c

src/sexypsf/PsxHLE.h

src/sexypsf/PsxHw.c

src/sexypsf/PsxHw.h

src/sexypsf/PsxInterpreter.c

src/sexypsf/PsxMem.c

src/sexypsf/PsxMem.h

src/sexypsf/R3000A.c

src/sexypsf/R3000A.h

src/sexypsf/Spu.c

src/sexypsf/Spu.h

src/sexypsf/driver.h

src/sexypsf/plugin.c

src/sexypsf/spu

src/sexypsf/spu/adsr.c

src/sexypsf/spu/adsr.h

src/sexypsf/spu/dma.c

src/sexypsf/spu/dma.h

src/sexypsf/spu/externals.h

src/sexypsf/spu/gauss_i.h

src/sexypsf/spu/registers.c

src/sexypsf/spu/registers.h

src/sexypsf/spu/regs.h

src/sexypsf/spu/reverb.c

src/sexypsf/spu/spu.c

src/sexypsf/spu/spu.h

src/sexypsf/spu/stdafx.h

src/sexypsf/types.h

src/vtx/config.c

files modified:
.hg_archival.txt

.hgtags

aclocal.m4

buildsys.mk.in

config.h.in

configure

configure.ac

debian/audacious-plugins-extra.install

debian/audacious-plugins.install

debian/changelog

debian/control

debian/patches/series

extra.mk.in

m4/buildsys.m4

m4/jack.m4

po/LINGUAS

po/POTFILES.in

po/audacious-plugins.pot

po/ca.po

po/cs.po

po/cy.po

po/de.po

po/et.po

po/fr.po

po/ja.po

po/ro.po

po/ru.po

po/sk.po

po/tr.po

src/aac/mp4ff/mp4ffint.h

src/adplug/adplug-xmms.cc

src/alarm/interface.c

src/amidi-plug/i_common.h

src/cdaudio-ng/cdaudio-ng.c

src/cdaudio-ng/configure.c

src/cdaudio-ng/configure.h

src/console/Audacious_Driver.cxx

src/crossfade/Makefile

src/crossfade/crossfade.c

src/crossfade/crossfade.h

src/crossfade/player.c

src/cue/cuesheet.c

src/gio/gio.c

src/icecast/icecast.c

src/jack/configure.c

src/jack/jack.c

src/ladspa/ladspa.c

src/madplug/configure.c

src/madplug/decoder.c

src/madplug/input.c

src/madplug/plugin.c

src/madplug/plugin.h

src/madplug/replaygain.c

src/modplug/gui/interface.cxx

src/modplug/modplugbmp.cxx

src/neon/neon.c

src/pulse_audio/pulse_audio.c

src/scrobbler/configure.c

src/scrobbler/plugin.c

src/sid/Makefile

src/sid/xmms-sid.c

src/sid/xmms-sid.h

src/sid/xs_config.c

src/sid/xs_config.h

src/sid/xs_interface.c

src/sid/xs_length.c

src/sid/xs_player.h

src/sid/xs_sidplay.h

src/sid/xs_sidplay1.cc

src/sid/xs_sidplay2.cc

src/sid/xs_stil.c

src/skins/actions-mainwin.h

src/skins/actions-playlist.h

src/skins/plugin.c

src/skins/skins_cfg.c

src/skins/skins_cfg.h

src/skins/ui_dock.c

src/skins/ui_dock.h

src/skins/ui_equalizer.c

src/skins/ui_equalizer.h

src/skins/ui_main.c

src/skins/ui_main.h

src/skins/ui_main_evlisteners.c

src/skins/ui_main_evlisteners.h

src/skins/ui_manager.c

src/skins/ui_manager.h

src/skins/ui_playlist.c

src/skins/ui_playlist.h

src/skins/ui_playlist_evlisteners.c

src/skins/ui_playlist_manager.c

src/skins/ui_playlist_manager.h

src/skins/ui_skin.c

src/skins/ui_skinned_button.c

src/skins/ui_skinned_equalizer_graph.c

src/skins/ui_skinned_equalizer_slider.c

src/skins/ui_skinned_horizontal_slider.c

src/skins/ui_skinned_menurow.c

src/skins/ui_skinned_menurow.h

src/skins/ui_skinned_monostereo.c

src/skins/ui_skinned_number.c

src/skins/ui_skinned_playlist.c

src/skins/ui_skinned_playlist.h

src/skins/ui_skinned_playlist_slider.c

src/skins/ui_skinned_playlist_slider.h

src/skins/ui_skinned_playstatus.c

src/skins/ui_skinned_textbox.c

src/skins/ui_skinned_window.c

src/skins/ui_svis.c

src/skins/ui_svis.h

src/skins/ui_vis.c

src/skins/ui_vis.h

src/sndfile/plugin.c

src/streambrowser/shoutcast.h

src/streambrowser/streambrowser.c

src/timidity/interface.c

src/timidity/libtimidity/common.c

src/timidity/libtimidity/timidity.c

src/vfstrace/vfstrace.c

src/vorbis/vorbis.c

src/vtx/Makefile

src/vtx/vtx.c

src/vtx/vtx.h

src/wma/libffwma/asf.c

src/wma/libffwma/mem.c

src/xspf/xspf.c

Show diffs side-by-side

added added

removed removed

src/modplug/gui/interface.cxx

131

131

GtkWidget *config_cancel;

132

132

133

133

Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);

134

gtk_window_set_type_hint(GTK_WINDOW(Config), GDK_WINDOW_TYPE_HINT_DIALOG);

134

135

gtk_widget_set_name (Config, "Config");

135

136

gtk_widget_set_size_request (Config, 500, -1);

136

137

gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));

Older »