← Back to branch summary

~ubuntu-branches/debian/sid/audacious-plugins/sid

~ubuntu-branches/debian/sid/audacious-plugins/sid

« back to all changes in this revision

Viewing changes to src/skins/ui_svis.c

Committer: Bazaar Package Importer
Author(s): Bilal Akhtar
Date: 2011-04-10 18:56:21 UTC
mfrom: (1.1.14 upstream) (2.1.7 experimental)
Revision ID: james.westby@ubuntu.com-20110410185621-7eg1k5a7v3f4aqrn

Tags: 2.4.4-1

http://bugs.debian.org/621989

http://bugs.debian.org/617603

* New upstream release.
  - Fix FTBFS with GCC 4.5 (Closes: #621989)
* Upload to unstable.
* debian/control:
  - Update versioned dependencies according to upstream changes.
  - Bump Standards-Version to 3.9.2 (no changes needed).
  - Since the package will be building against the new FFMpeg libs,
    fix the problem of depending on old uninstallable libav*
    packages (Closes: #617603)

files added:
po/es.po

po/hu.po

po/pl.po

po/zh_CN.po

src/crossfade/plugin.c

src/gtkui/playlist_util.c

src/gtkui/playlist_util.h

src/gtkui/ui

src/gtkui/ui/player.ui

src/gtkui/ui_infoarea.c

src/gtkui/ui_infoarea.h

src/gtkui/ui_playlist_notebook.c

src/gtkui/ui_playlist_notebook.h

src/gtkui/ui_statusbar.c

src/gtkui/ui_statusbar.h

src/lyricwiki

src/lyricwiki/Makefile

src/lyricwiki/lyricwiki.c

src/lyricwiki/urlencode.c

src/lyricwiki/urlencode.h

src/mpg123

src/mpg123/Makefile

src/mpg123/id3skip.c

src/mpg123/libmpg123

src/mpg123/libmpg123/AUTHORS

src/mpg123/libmpg123/COPYING

src/mpg123/libmpg123/README

src/mpg123/libmpg123/aligncheck.h

src/mpg123/libmpg123/compat.c

src/mpg123/libmpg123/compat.h

src/mpg123/libmpg123/config.h

src/mpg123/libmpg123/dct64.c

src/mpg123/libmpg123/debug.h

src/mpg123/libmpg123/decode.h

src/mpg123/libmpg123/equalizer.c

src/mpg123/libmpg123/feature.c

src/mpg123/libmpg123/format.c

src/mpg123/libmpg123/frame.c

src/mpg123/libmpg123/frame.h

src/mpg123/libmpg123/getbits.h

src/mpg123/libmpg123/getcpuflags.h

src/mpg123/libmpg123/huffman.h

src/mpg123/libmpg123/icy.c

src/mpg123/libmpg123/icy.h

src/mpg123/libmpg123/icy2utf8.c

src/mpg123/libmpg123/icy2utf8.h

src/mpg123/libmpg123/id3.c

src/mpg123/libmpg123/id3.h

src/mpg123/libmpg123/index.c

src/mpg123/libmpg123/index.h

src/mpg123/libmpg123/l12_integer_tables.h

src/mpg123/libmpg123/l2tables.h

src/mpg123/libmpg123/l3_integer_tables.h

src/mpg123/libmpg123/layer1.c

src/mpg123/libmpg123/layer2.c

src/mpg123/libmpg123/layer3.c

src/mpg123/libmpg123/libmpg123.c

src/mpg123/libmpg123/mpg123.h

src/mpg123/libmpg123/mpg123lib_intern.h

src/mpg123/libmpg123/optimize.c

src/mpg123/libmpg123/optimize.h

src/mpg123/libmpg123/parse.c

src/mpg123/libmpg123/parse.h

src/mpg123/libmpg123/reader.h

src/mpg123/libmpg123/readers.c

src/mpg123/libmpg123/sample.h

src/mpg123/libmpg123/stringbuf.c

src/mpg123/libmpg123/synth.c

src/mpg123/libmpg123/synth.h

src/mpg123/libmpg123/synth_mono.h

src/mpg123/libmpg123/synths.h

src/mpg123/libmpg123/tabinit.c

src/mpg123/libmpg123/true.h

src/mpg123/mpg123.c

src/notify

src/notify/Makefile

src/notify/libnotify-aosd.c

src/notify/libnotify-aosd.h

src/notify/libnotify-aosd_common.h

src/notify/libnotify-aosd_event.c

src/notify/libnotify-aosd_event.h

src/notify/libnotify-aosd_osd.c

src/notify/libnotify-aosd_osd.h

src/oss4

src/oss4/Makefile

src/oss4/configure.c

src/oss4/oss.c

src/oss4/oss.h

src/oss4/plugin.c

src/oss4/utils.c

src/pls/util.c

src/pls/util.h

src/roaraudio

src/roaraudio/KNOWN-ISSUES

src/roaraudio/Makefile

src/roaraudio/all.h

src/roaraudio/roar.c

src/scrobbler

src/scrobbler/Makefile

src/scrobbler/configure.c

src/scrobbler/fmt.c

src/scrobbler/fmt.h

src/scrobbler/plugin.c

src/scrobbler/plugin.h

src/scrobbler/scrobbler.c

src/scrobbler/scrobbler.h

src/scrobbler/settings.h

src/skins/ui

src/skins/ui/carbon-menubar.ui

src/skins/ui/equalizer.ui

src/skins/ui/mainwin.ui

src/skins/ui/playlist.ui

src/statusicon/config.c

src/statusicon/statusicon.c

src/statusicon/statusicon.h

src/statusicon/util.c

files removed:
.pc

.pc/.version

.pc/applied-patches

.pc/panel-icon.patch

.pc/panel-icon.patch/src

.pc/panel-icon.patch/src/statusicon

.pc/panel-icon.patch/src/statusicon/si_ui.c

.pc/remove-psf.patch

.pc/remove-psf.patch/configure

.pc/remove-psf.patch/configure.ac

README.icecast

debian/patches

debian/patches/panel-icon.patch

debian/patches/remove-psf.patch

debian/patches/series

m4/libxml.m4

scripts

scripts/makerelease.sh

src/OSS4

src/OSS4/Makefile

src/OSS4/OSS4.c

src/OSS4/OSS4.h

src/OSS4/audio.c

src/OSS4/configure.c

src/OSS4/convert.c

src/crossfade/TODO

src/crossfade/callbacks.c

src/crossfade/callbacks.h

src/crossfade/cfgutil.c

src/crossfade/cfgutil.h

src/crossfade/configure.c

src/crossfade/configure.h

src/crossfade/debug.c

src/crossfade/interface-2.0.c

src/crossfade/interface-2.0.h

src/crossfade/player.c

src/crossfade/player.h

src/crossfade/support-2.0.c

src/crossfade/support-2.0.h

src/esd

src/esd/Makefile

src/esd/about.c

src/esd/audio.c

src/esd/configure.c

src/esd/esd.c

src/esd/esdout.h

src/esd/init.c

src/esd/mixer.c

src/ffaudio/ffaudio-debug.h

src/flacng/debug.h

src/flacng/plugin.h

src/gtkui/ui_playlist_manager.c

src/gtkui/ui_playlist_manager.h

src/icecast

src/icecast/Makefile

src/icecast/icecast.c

src/madplug

src/madplug/Makefile

src/madplug/TODO

src/madplug/configure.c

src/madplug/decoder.c

src/madplug/input.c

src/madplug/input.h

src/madplug/plugin.c

src/madplug/plugin.h

src/madplug/replaygain.c

src/madplug/replaygain.h

src/madplug/tuple.c

src/madplug/tuple.h

src/madplug/xing.c

src/madplug/xing.h

src/paranormal-ng

src/paranormal-ng/Makefile

src/paranormal-ng/TODO

src/paranormal-ng/actuators.c

src/paranormal-ng/actuators.h

src/paranormal-ng/beatdetect.c

src/paranormal-ng/builtins.c

src/paranormal-ng/cfg.c

src/paranormal-ng/cmaps.c

src/paranormal-ng/containers.c

src/paranormal-ng/containers.h

src/paranormal-ng/drawing.c

src/paranormal-ng/drawing.h

src/paranormal-ng/freq.c

src/paranormal-ng/general.c

src/paranormal-ng/libcalc

src/paranormal-ng/libcalc/calc.h

src/paranormal-ng/libcalc/dict.c

src/paranormal-ng/libcalc/dict.h

src/paranormal-ng/libcalc/execute.c

src/paranormal-ng/libcalc/execute.h

src/paranormal-ng/libcalc/function.c

src/paranormal-ng/libcalc/function.h

src/paranormal-ng/libcalc/parser.c

src/paranormal-ng/libcalc/parser.h

src/paranormal-ng/libcalc/parser.yacc

src/paranormal-ng/libcalc/storage.c

src/paranormal-ng/libcalc/storage.h

src/paranormal-ng/misc.c

src/paranormal-ng/paranormal.c

src/paranormal-ng/paranormal.h

src/paranormal-ng/plugin.c

src/paranormal-ng/pn_utils.h

src/paranormal-ng/presets

src/paranormal-ng/presets.c

src/paranormal-ng/presets.h

src/paranormal-ng/presets/Makefile

src/paranormal-ng/presets/aerdan_-_bloody_vortex.pnv

src/paranormal-ng/presets/aerdan_-_cloudscape.pnv

src/paranormal-ng/presets/aerdan_-_cloudscape2.pnv

src/paranormal-ng/presets/aerdan_-_dancing_snow.pnv

src/paranormal-ng/presets/aerdan_-_portal_to_hell.pnv

src/paranormal-ng/presets/aerdan_-_stonervision.pnv

src/paranormal-ng/presets/aerdan_-_telestatic.pnv

src/paranormal-ng/presets/nazca_-_smoke_on_the_water.pnv

src/paranormal-ng/presets/nenolod_-_3d_wave.pnv

src/paranormal-ng/presets/nenolod_-_aquamarine_dream.pnv

src/paranormal-ng/presets/nenolod_-_beatscope.pnv

src/paranormal-ng/presets/nenolod_-_branchscope.pnv

src/paranormal-ng/presets/nenolod_-_bumblebees.pnv

src/paranormal-ng/presets/nenolod_-_cubism.pnv

src/paranormal-ng/presets/nenolod_-_flying_into_pastels.pnv

src/paranormal-ng/presets/nenolod_-_interlaced.pnv

src/paranormal-ng/presets/nenolod_-_kaliedoscope.pnv

src/paranormal-ng/presets/nenolod_-_phosphor_flame.pnv

src/paranormal-ng/presets/nenolod_-_psuedo_starfield.pnv

src/paranormal-ng/presets/nenolod_-_purple_flower.pnv

src/paranormal-ng/presets/nenolod_-_quakingscope.pnv

src/paranormal-ng/presets/nenolod_-_quasar.pnv

src/paranormal-ng/presets/nenolod_-_retroscope.pnv

src/paranormal-ng/presets/nenolod_-_rush.pnv

src/paranormal-ng/presets/nenolod_-_scopefun.pnv

src/paranormal-ng/presets/nenolod_-_simple_yet_pretty.pnv

src/paranormal-ng/presets/nenolod_-_smoke.pnv

src/paranormal-ng/presets/nenolod_-_swarm.pnv

src/paranormal-ng/presets/nenolod_-_technicolour_nightmare.pnv

src/paranormal-ng/presets/nenolod_-_transform_fun.pnv

src/paranormal-ng/presets/nenolod_-_trapped.pnv

src/paranormal-ng/presets/nenolod_-_tunnel_vision.pnv

src/paranormal-ng/presets/nenolod_-_value_replace_fun.pnv

src/paranormal-ng/presets/nenolod_-_worms.pnv

src/paranormal-ng/presets/ticpu_-_colored_beat-o-scope.pnv

src/paranormal-ng/wave.c

src/paranormal-ng/xform.c

src/skins/ui_playlist_manager.c

src/skins/ui_playlist_manager.h

src/statusicon/si.c

src/statusicon/si.h

src/statusicon/si.xpm

src/statusicon/si2.xpm

src/statusicon/si_audacious.h

src/statusicon/si_cfg.c

src/statusicon/si_cfg.h

src/statusicon/si_common.h

src/statusicon/si_ui.c

src/statusicon/si_ui.h

src/vfstrace

src/vfstrace/Makefile

src/vfstrace/vfstrace.c

src/wavpack/common.h

src/wavpack/tags.c

src/wavpack/ui.c

files modified:
Makefile

aclocal.m4

buildsys.mk.in

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/gbp.conf

debian/rules

debian/watch

extra.mk.in

m4/sid.m4

po/Makefile

po/POTFILES.in

po/audacious-plugins.pot

po/ca.po

po/cs.po

po/cy.po

po/de.po

po/et.po

po/eu.po

po/fr.po

po/ja.po

po/lv.po

po/ro.po

po/ru.po

po/sk.po

po/tr.po

src/CoreAudio/about.c

src/CoreAudio/audio.c

src/CoreAudio/coreaudio.h

src/OSS/OSS.c

src/OSS/OSS.h

src/OSS/audio.c

src/OSS/configure.c

src/aac/libmp4.c

src/adplug/adplug-xmms.cc

src/adplug/core/a2m.cxx

src/adplug/core/adl.cxx

src/adplug/core/adplug.cxx

src/adplug/core/adplug.h

src/adplug/core/adtrack.cxx

src/adplug/core/binio_virtual.h

src/adplug/core/bmf.cxx

src/adplug/core/cff.cxx

src/adplug/core/cmf.cxx

src/adplug/core/dro.cxx

src/adplug/core/dtm.cxx

src/adplug/core/fmc.cxx

src/adplug/core/ksm.cxx

src/adplug/core/lds.cxx

src/adplug/core/mad.cxx

src/adplug/core/mid.cxx

src/adplug/core/mkj.cxx

src/adplug/core/msc.cxx

src/adplug/core/mtk.cxx

src/adplug/core/protrack.cxx

src/adplug/core/rad.cxx

src/adplug/core/rat.cxx

src/adplug/core/raw.cxx

src/adplug/core/rix.cxx

src/adplug/core/rol.cxx

src/adplug/core/s3m.cxx

src/adplug/core/sa2.cxx

src/adplug/core/sng.cxx

src/adplug/plugin.c

src/alarm/alarm.c

src/alsa/Makefile

src/alsa/alsa.c

src/alsa/alsa.h

src/alsa/config.c

src/alsa/plugin.c

src/amidi-plug/amidi-plug.c

src/amidi-plug/amidi-plug.h

src/amidi-plug/backend-fluidsynth/b-fluidsynth.c

src/amidi-plug/i_backend.c

src/amidi-plug/i_configure-alsa.c

src/amidi-plug/i_configure.c

src/amidi-plug/i_midi.c

src/amidi-plug/i_utils.c

src/amidi-plug/i_vfslayer.h

src/aosd/aosd_cfg.c

src/aosd/aosd_trigger.c

src/bluetooth/bluetooth.c

src/blur_scope/blur_scope.c

src/blur_scope/config.c

src/bs2b/plugin.c

src/cd-menu-items/cd-menu-items.c

src/cdaudio-ng/cdaudio-ng.c

src/compressor/Makefile

src/compressor/compressor.c

src/compressor/compressor.h

src/compressor/plugin.c

src/console/Audacious_Driver.cxx

src/console/Data_Reader.cxx

src/console/Spc_Cpu.cxx

src/console/Vfs_File.cxx

src/console/Vfs_File.h

src/console/Ym2413_Emu.cxx

src/console/abstract_file.cxx

src/console/configure.c

src/console/plugin.c

src/crossfade/Makefile

src/crossfade/crossfade.c

src/crossfade/crossfade.h

src/crystalizer/crystalizer.c

src/cue/Makefile

src/cue/cue.c

src/daap/daap.c

src/dockalbumart/dockalbumart.c

src/echo_plugin/echo.c

src/echo_plugin/gui.c

src/evdev-plug/ed.c

src/evdev-plug/ed_internals.c

src/ffaudio/ffaudio-audvfs.c

src/ffaudio/ffaudio-core.c

src/ffaudio/ffaudio-stdinc.h

src/filewriter/convert.c

src/filewriter/convert.h

src/filewriter/filewriter.c

src/filewriter/filewriter.h

src/filewriter/flac.c

src/filewriter/mp3.c

src/filewriter/vorbis.c

src/filewriter/wav.c

src/flacng/flac_compat112.c

src/flacng/flacng.h

src/flacng/plugin.c

src/flacng/seekable_stream_callbacks.c

src/flacng/tools.c

src/flacng/tools.h

src/gio/Makefile

src/gio/gio.c

src/gnomeshortcuts/gnomeshortcuts.c

src/gntui/fileselector.c

src/gntui/gntui.c

src/gtkui/Makefile

src/gtkui/actions-mainwin.h

src/gtkui/actions-playlist.h

src/gtkui/actions.c

src/gtkui/gtkui_cfg.c

src/gtkui/gtkui_cfg.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_model.c

src/gtkui/ui_playlist_model.h

src/gtkui/ui_playlist_widget.c

src/gtkui/ui_playlist_widget.h

src/gtkui/util.c

src/gtkui/util.h

src/hotkey/Makefile

src/hotkey/gui.c

src/hotkey/plugin.c

src/jack/Makefile

src/jack/bio2jack.c

src/jack/bio2jack.h

src/jack/configure.c

src/jack/jack.c

src/kanashi/Makefile

src/kanashi/kanashi.c

src/kanashi/plugin.c

src/kanashi/wave.c

src/ladspa/Makefile

src/ladspa/ladspa.c

src/lirc/lirc.c

src/lirc/lirc_cfg.c

src/m3u/Makefile

src/m3u/m3u.c

src/metronom/metronom.c

src/mms/Makefile

src/mms/mms.c

src/modplug/archive/arch_raw.cxx

src/modplug/gui/main.cxx

src/modplug/modplugbmp.cxx

src/modplug/modplugbmp.h

src/modplug/plugin.cxx

src/modplug/plugin_main.c

src/mtp_up/filetype.c

src/mtp_up/mtp.c

src/neon/Makefile

src/neon/cert_verification.c

src/neon/cert_verification.h

src/neon/neon.c

src/null/null.c

src/paranormal/Makefile

src/paranormal/cfg.c

src/paranormal/libcalc/parser.c

src/paranormal/libcalc/parser.yacc

src/paranormal/plugin.c

src/pls/Makefile

src/pls/pls.c

src/projectm-1.0/Makefile

src/projectm-1.0/gtk_projectm_impl.cxx

src/projectm-1.0/main.c

src/projectm/Makefile

src/projectm/main.c

src/pulse_audio/pulse_audio.c

src/resample/plugin.c

src/sid/Makefile

src/sid/xmms-sid.c

src/sid/xmms-sid.h

src/sid/xs_config.c

src/sid/xs_fileinfo.c

src/sid/xs_filter.c

src/sid/xs_filter.h

src/sid/xs_init.c

src/sid/xs_length.c

src/sid/xs_player.h

src/sid/xs_support.c

src/sid/xs_support.h

src/skins/Makefile

src/skins/Skins/Refugee/titlebar.png

src/skins/actions-playlist.h

src/skins/plugin.c

src/skins/plugin.h

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_main.c

src/skins/ui_main_evlisteners.c

src/skins/ui_main_evlisteners.h

src/skins/ui_manager.c

src/skins/ui_playlist.c

src/skins/ui_playlist.h

src/skins/ui_playlist_evlisteners.c

src/skins/ui_skin.c

src/skins/ui_skinned_button.c

src/skins/ui_skinned_equalizer_graph.c

src/skins/ui_skinned_equalizer_graph.h

src/skins/ui_skinned_equalizer_slider.c

src/skins/ui_skinned_equalizer_slider.h

src/skins/ui_skinned_horizontal_slider.c

src/skins/ui_skinned_number.c

src/skins/ui_skinned_number.h

src/skins/ui_skinned_playlist.c

src/skins/ui_skinned_playlist.h

src/skins/ui_skinned_textbox.c

src/skins/ui_skinselector.c

src/skins/ui_skinselector.h

src/skins/ui_svis.c

src/skins/ui_vis.c

src/skins/ui_vis.h

src/skins/util.c

src/skins/util.h

src/smb/Makefile

src/smb/smb.c

src/sndfile/Makefile

src/sndfile/plugin.c

src/sndstretch/Makefile

src/sndstretch/sndstretch_xmms.c

src/song_change/song_change.c

src/spectrum/Makefile

src/statusicon/Makefile

src/stereo_plugin/stereo.c

src/streambrowser/Makefile

src/streambrowser/bookmarks.c

src/streambrowser/gui/streambrowser_win.c

src/streambrowser/shoutcast.c

src/streambrowser/streambrowser.c

src/streambrowser/xiph.c

src/sun/about.c

src/sun/audio.c

src/sun/configure.c

src/sun/sun.c

src/sun/sun.h

src/tonegen/Makefile

src/tonegen/tonegen.c

src/unix-io/unix-io.c

src/voice_removal/voice_removal.c

src/vorbis/configure.c

src/vorbis/vcedit.c

src/vorbis/vcupdate.c

src/vorbis/vorbis.c

src/vorbis/vorbis.h

src/vtx/about.c

src/vtx/info.c

src/vtx/vtx.c

src/vtx/vtxfile.c

src/wavpack/Makefile

src/wavpack/wavpack.c

src/xsf/Makefile

src/xsf/desmume/arm_instructions.c

src/xsf/desmume/armcpu.c

src/xsf/plugin.c

src/xsf/vio2sf.c

src/xspf/Makefile

src/xspf/xspf.c

Show diffs side-by-side

added added

removed removed

src/skins/ui_svis.c

29

29

#include "ui_vis.h"

30

30

#include "util.h"

31

31

#include "skins_cfg.h"

32

#include <audacious/plugin.h>

32

33

33

#include <string.h>

34

34

#include <ctype.h>

35

35

#include <gtk/gtkmain.h>

36

36

#include <gtk/gtkmarshal.h>

37

37

#include <gtk/gtkimage.h>

38

38

39

#include <audacious/drct.h>

40

#include <audacious/plugin.h>

41

39

42

#define UI_TYPE_SVIS (ui_svis_get_type())

40

43

41

44

/* FIXME: Are the svis_scope_colors correct? */

322

325

if (!config.scaled)

323

326

{

324

327

memset (rgb_data, 0, SVIS_WIDTH * SVIS_HEIGHT);

325

if (config.vis_type == VIS_ANALYZER && !audacious_drct_get_paused ()

326

&& audacious_drct_get_playing ())

328

if (config.vis_type == VIS_ANALYZER && !aud_drct_get_paused ()

329

&& aud_drct_get_playing ())

327

330

{

328

331

for (y = 0; y < SVIS_HEIGHT; y++)

329

332

{

402

405

memset (rgb_data, 0,

403

406

SVIS_WIDTH * config.scale_factor * SVIS_HEIGHT *

404

407

config.scale_factor);

405

if (config.vis_type == VIS_ANALYZER && !audacious_drct_get_paused ()

406

&& audacious_drct_get_playing ())

408

if (config.vis_type == VIS_ANALYZER && !aud_drct_get_paused ()

409

&& aud_drct_get_playing ())

407

410

{

408

411

for (y = 0; y < SVIS_HEIGHT; y++)

409

412

{

Older »