90b67faf65
2007-01-08 Jan Arne Petersen <jpetersen@jpetersen.org> Fixes #173035 * configure.in: updated sound capplet requirements. * gnome-settings-daemon/actions/Makefile.am: * gnome-settings-daemon/actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute), (update_state), (acme_volume_gstreamer_get_mute), (acme_volume_gstreamer_get_volume), (acme_volume_gstreamer_set_volume), (acme_volume_gstreamer_close_real), (_acme_set_mixer), (acme_volume_gstreamer_open), (acme_volume_gstreamer_init): added support for multiple mixer tracks. Added support for gconf device and track selection. * capplets/sound/Makefile.am, mixer-support.c, mixer-support.h: Add new files. * capplets/sound/sound-properties-capplet.c: (mixer_device_combobox_changed), (add_track_label_to_list), (mixer_tracks_selection_changed), (update_mixer_tracks_selection), (default_mixer_tracks_notify), (update_mixer_device_combobox), (default_mixer_device_notify), (setup_default_mixer), (setup_dialog): * capplets/sound/sound-properties.glade: added support for selecting mixer device and tracks in the capplet. svn path=/trunk/; revision=7113
40 lines
1,022 B
Makefile
40 lines
1,022 B
Makefile
INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) $(GST_CFLAGS)
|
|
|
|
noinst_LTLIBRARIES = libacme.la
|
|
|
|
libacme_la_SOURCES = \
|
|
acme-volume.c acme-volume.h \
|
|
acme-volume-dummy.c acme-volume-dummy.h
|
|
|
|
libacme_la_LIBADD =
|
|
|
|
if HAVE_GSTREAMER
|
|
INCLUDES += -DHAVE_GSTREAMER
|
|
libacme_la_SOURCES += acme-volume-gstreamer.c acme-volume-gstreamer.h
|
|
libacme_la_LIBADD += $(GST_LIBS)
|
|
else # HAVE_GSTREAMER
|
|
if HAVE_ALSA
|
|
INCLUDES += -DHAVE_ALSA
|
|
libacme_la_SOURCES += acme-volume-alsa.c acme-volume-alsa.h
|
|
libacme_la_LIBADD += $(ALSA_LIBS)
|
|
else # HAVE_ALSA
|
|
if HAVE_OSS
|
|
INCLUDES += -DHAVE_OSS
|
|
libacme_la_SOURCES += acme-volume-oss.c acme-volume-oss.h
|
|
endif # HAVE_OSS
|
|
endif # HAVE_ALSA
|
|
endif # HAVE_GSTREAMER
|
|
|
|
Datadir = $(datadir)/control-center-2.0/interfaces/
|
|
Data_DATA = acme.glade
|
|
|
|
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
|
pixmaps_DATA = acme-eject.png
|
|
|
|
EXTRA_DIST = \
|
|
acme-volume-alsa.c acme-volume-alsa.h \
|
|
acme-volume-gstreamer.c acme-volume-gstreamer.h \
|
|
acme-volume-oss.c acme-volume-oss.h \
|
|
acme.h \
|
|
acme.glade \
|
|
$(pixmaps_DATA)
|