2007-02-03 17:18:29 +00:00
|
|
|
# This is used in GNOMECC_CAPPLETS_CFLAGS
|
|
|
|
|
cappletname = sound
|
|
|
|
|
|
2002-04-10 06:08:08 +00:00
|
|
|
bin_PROGRAMS = gnome-sound-properties
|
2000-10-08 16:38:31 +00:00
|
|
|
|
2004-03-31 21:30:23 +00:00
|
|
|
gnome_sound_properties_LDADD = \
|
2008-02-09 15:41:21 +00:00
|
|
|
$(top_builddir)/libsounds/libsounds.la \
|
2004-03-31 21:30:23 +00:00
|
|
|
$(GNOMECC_CAPPLETS_LIBS) \
|
Add sound device selection using HAL and GStreamer (Closes: #329112).
2006-05-05 Jürg Billeter <j@bitron.ch>
* Makefile.am:
* pipeline-tests.c: (user_test_pipeline_response),
(user_test_pipeline_timeout), (build_test_pipeline),
(pipeline_error_dlg), (user_test_pipeline):
* pipeline-tests.h:
* sound-properties-capplet.c: (element_available), (add_device),
(remove_device), (device_added_callback),
(device_removed_callback), (setup_hal_devices),
(device_test_button_clicked), (get_gconf_key_for_profile),
(device_changed), (get_gconf_description_for_profile),
(gconf_key_changed), (setup_device_chooser), (add_selected_device),
(setup_devices), (setup_dialog), (main):
* sound-properties.glade:
Add sound device selection using HAL and GStreamer (Closes: #329112).
2006-05-05 13:24:27 +00:00
|
|
|
$(SOUND_CAPPLET_LIBS) \
|
|
|
|
|
$(HAL_LIBS)
|
Fixes #173035
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
2007-01-08 22:50:39 +00:00
|
|
|
gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pipeline-tests.c mixer-support.h mixer-support.c
|
2001-07-25 17:26:17 +00:00
|
|
|
|
2007-06-28 17:51:19 +00:00
|
|
|
INCLUDES = \
|
|
|
|
|
$(GNOMECC_CAPPLETS_CFLAGS) \
|
|
|
|
|
$(SOUND_CAPPLET_CFLAGS) \
|
|
|
|
|
$(HAL_CFLAGS) \
|
|
|
|
|
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
|
|
|
|
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
|
|
|
|
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
|
|
|
|
|
2001-11-10 20:55:08 +00:00
|
|
|
@INTLTOOL_DESKTOP_RULE@
|
2001-07-26 01:49:13 +00:00
|
|
|
|
2007-06-28 17:51:19 +00:00
|
|
|
gladedir = $(pkgdatadir)/glade
|
|
|
|
|
dist_glade_DATA = sound-properties.glade
|
|
|
|
|
|
|
|
|
|
pixmapdir = $(pkgdatadir)/pixmaps
|
|
|
|
|
dist_pixmap_DATA = visual-bell.png
|
2001-07-26 01:49:13 +00:00
|
|
|
|
2007-06-29 18:50:12 +00:00
|
|
|
icons16dir = $(datadir)/icons/hicolor/16x16/apps
|
2007-06-28 17:51:19 +00:00
|
|
|
dist_icons16_DATA = icons/16x16/gnome-sound-properties.png
|
2007-06-29 18:50:12 +00:00
|
|
|
icons22dir = $(datadir)/icons/hicolor/22x22/apps
|
2007-06-28 17:51:19 +00:00
|
|
|
dist_icons22_DATA = icons/22x22/gnome-sound-properties.png
|
2007-06-29 18:50:12 +00:00
|
|
|
icons24dir = $(datadir)/icons/hicolor/24x24/apps
|
2007-06-28 17:51:19 +00:00
|
|
|
dist_icons24_DATA = icons/24x24/gnome-sound-properties.png
|
2007-06-29 18:50:12 +00:00
|
|
|
icons32dir = $(datadir)/icons/hicolor/32x32/apps
|
2007-06-28 17:51:19 +00:00
|
|
|
dist_icons32_DATA = icons/32x32/gnome-sound-properties.png
|
2007-12-11 10:29:44 +00:00
|
|
|
icons48dir = $(datadir)/icons/hicolor/48x48/apps
|
|
|
|
|
dist_icons48_DATA = icons/48x48/gnome-sound-properties.png
|
2007-06-29 18:50:12 +00:00
|
|
|
iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
|
2007-06-28 17:51:19 +00:00
|
|
|
dist_iconssvg_DATA = icons/scalable/gnome-sound-properties.svg
|
2002-01-19 15:18:33 +00:00
|
|
|
|
2004-11-09 17:43:47 +00:00
|
|
|
desktopdir = $(datadir)/applications
|
2003-12-16 21:38:53 +00:00
|
|
|
Desktop_in_files = gnome-settings-sound.desktop.in
|
2002-01-15 20:45:34 +00:00
|
|
|
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
2001-07-18 03:21:07 +00:00
|
|
|
|
2007-06-28 17:51:19 +00:00
|
|
|
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
|
|
|
|
|
uninstall-hook: update-icon-cache
|
|
|
|
|
install-data-hook: update-icon-cache
|
|
|
|
|
update-icon-cache:
|
|
|
|
|
@-if test -z "$(DESTDIR)"; then \
|
|
|
|
|
echo "Updating Gtk icon cache."; \
|
|
|
|
|
$(gtk_update_icon_cache); \
|
|
|
|
|
else \
|
|
|
|
|
echo "*** Icon cache not updated. After install, run this:"; \
|
|
|
|
|
echo "*** $(gtk_update_icon_cache)"; \
|
|
|
|
|
fi
|
|
|
|
|
|
2004-11-28 08:14:05 +00:00
|
|
|
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
