[Xfce4-commits] <xfce4-mixer:master> Release 4.8.0!
Jannis Pohlmann
noreply at xfce.org
Fri Feb 25 14:20:01 CET 2011
Updating branch refs/heads/master
to ef6a13c74eb809b1fe1f0f0e42a89e7b3bf5fef5 (commit)
from 0139711db5365b9b5b3b01153845fbee569f84da (commit)
commit ef6a13c74eb809b1fe1f0f0e42a89e7b3bf5fef5
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Fri Feb 25 14:09:46 2011 +0100
Release 4.8.0!
ChangeLog | 645 ------------------------------
Makefile.am | 30 ++-
NEWS | 14 +
autogen.sh | 51 +--
configure.in.in | 118 +++----
libxfce4mixer/xfce-mixer-card-combo.c | 2 -
panel-plugin/xfce-mixer-plugin.c | 9 +-
panel-plugin/xfce-plugin-dialog.c | 2 -
panel-plugin/xfce-volume-button.c | 6 +-
xfce4-mixer/xfce-mixer-controls-dialog.c | 3 +-
xfce4-mixer/xfce-mixer-option.c | 6 +-
xfce4-mixer/xfce-mixer-switch.c | 2 -
xfce4-mixer/xfce-mixer-track.c | 2 -
xfce4-mixer/xfce-mixer-window.c | 2 +-
xfce4-mixer/xfce-mixer.c | 7 +-
15 files changed, 117 insertions(+), 782 deletions(-)
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index f1e7f86..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,645 +0,0 @@
-2009-05-28 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Set the page size to 0 which
- allows the volume to be changed up to 100% instead of just 90% (bug
- #5243).
-
-2009-04-18 Stephan Arts <stephan at xfce.org>
-
- * == Xfce 4.6.1 Released ==
- * NEWS: update NEWS, add 4.6.0 stuff too
- * configure.in.in: Bump version number
-
-2009-04-08 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/libxfce4mixer.c: Fix crash with backends where the
- GstMixer implementation has no "device-name" property (bug #5201).
- * xfce4-mixer/main.c: Include libxfcegui4.h to avoid implicit
- declaration of xfce_err().
-
-2009-04-05 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Display mute/record state properly
- on startup (bug #5002). Fix segfault when destroying the plugin
- (thanks to Cody Somerville for hunting this one down) (bug #4948).
- * xfce4-mixer/xfce-mixer-track.c: Move capture track check into
- xfce_mixer_track_update_record().
- * xfce4-mixer/xfce-mixer.c: Don't increment the reference count on
- GObjects when passing them to GValue using g_value_set_object().
-
-2009-02-13 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce4-mixer.desktop.in.in: Add missing AudioVideo
- category which is obligatory if you use the Audio category (bug
- #4933).
-
-2009-02-10 Jannis Pohlmann <jannis at xfce.org>
-
- * TODO: Remove a few things from the TODO list.
- * configure.in.in: Add the svn version tag back again.
- * xfce4-mixer/xfce-mixer.c, xfce4-mixer/xfce-mixer-track.c: Minor
- cosmetic fixes (row spacing of 6px in tables).
- * xfce4-mixer/xfce-mixer-window.c: Make <Control>q and <Control>s
- trigger the corresponding actions.
-
-2009-02-03 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Use the GstMixerTrack "label"
- property instead of the struct member to access the name of a track.
- Toggle record for capture tracks instead of trying to mute them.
- Capture tracks don't support muting (bug #4777).
- * xfce4-mixer/xfce-mixer-track.c: Don't show the mute button for
- capture tracks (follow up of bug #4777).
- * xfce4-mixer/xfce-mixer.c: Use the "label" property everywhere. I
- missed a few appearances of the struct member in the previous commit.
- Copy track labels for the hash table keys. The previous commit b0rked
- this (follow up of bug #4521).
-
-2009-02-01 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/libxfce4mixer.c,
- libxfce4mixer/xfce-mixer-preferences.c,
- libxfce4mixer/xfce-mixer-track-combo.c,
- xfce4-mixer/xfce-mixer-controls-dialog.c,
- xfce4-mixer/xfce-mixer-option.c, xfce4-mixer/xfce-mixer-switch.c,
- xfce4-mixer/xfce-mixer-track.c, xfce4-mixer/xfce-mixer.c: Don't read
- track labels from the 'label' member of the GstMixerTrack struct.
- Instead, use the 'label' property. The struct member is undocumented
- and may not work with all backends.
-
-2009-01-25 Jannis Pohlmann <jannis at xfce.org>
-
- * == 4.5.99.1 released! ==
- * NEWS: Update NEWS file for the release.
- * configure.in.in: Bump version number and dependencies.
-
-2009-01-14 Jannis Pohlmann <jannis at xfce.org>
-
- * configure.in.in: Post-release version bump.
-
-2009-01-11 Jannis Pohlmann <jannis at xfce.org>
-
- * == 4.5.93 released! ==
- * configure.in.in: Bump version and dependencies and a remove 'svn'
- version tag.
-
-2009-01-11 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS: Update NEWS for the upcoming 4.5.93 release.
-
-2009-01-11 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Change step size to 5% instead
- of 1% because 1% is unusable if you don't have a laptop with a nice
- touchpad. I'll have to come up with a more intelligent solution for
- that in the next release, I guess.
-
-2009-01-08 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/main.c: Use multimedia-volume-control instead of
- xfce4-mixer icon for all windows.
-
-2008-12-10 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Another string improvement
- (hopefully).
-
-2008-12-10 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c, panel-plugin/xfce-plugin-dialog.c,
- xfce4-mixer/main.c, xfce4-mixer/xfce-mixer.c: Try to improve strings
- even further in reply to Brian's comments.
-
-2008-12-10 Josh Saddler <nightmorph at gentoo.org>
-
- * panel-plugin/xfce-mixer-plugin.c, panel-plugin/xfce-plugin-dialog.c,
- xfce4-mixer/xfce-mixer-controls-dialog.c,
- xfce4-mixer/xfce-mixer-window.c, xfce4-mixer/xfce-mixer.c: Improve
- strings as part of the string review process.
-
-2008-11-11 Jannis Pohlmann <jannis at xfce.org>
-
- * == 4.5.92 released ==
- * configure.in.in: Bump version. Update dependencies.
-
-2008-11-11 Jannis Pohlmann <jannis at xfce.org>
-
- * po/POTFILES.in: Remove xfce-mixer-stock.{c,h}.
-
-2008-11-11 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS: Update NEWS file for the upcoming beta2 release.
-
-2008-11-06 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-preferences.c: Use
- xfconf_channel_reset_property() instead of
- xfconf_channel_remove_property() which has been deprecated.
-
-2008-11-06 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/, libxfce4mixer/, panel-plugin/, xfce4-mixer/: Icons have been
- renamed again. They're installed to $(pkgdatadir)/icons/hicolor now to
- make them themeable. Remove the stock code.
-
-2008-11-04 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/, libxfce4mixer/xfce-mixer-stock.{c,h},
- panel-plugin/xfce-volume-button.c: Rename volume status icons from
- audio-volume-{00-06} to stock_xfce4-mixer-volume-{00-06} to avoid
- possible conflicts with other packages.
-
-2008-11-02 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Change step and page increment
- size to 0.01 instead of 0.05. This allows for better fine-tuning of
- the volume. Having a 5% step size has been annoying.
-
-2008-11-01 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/*.{c,h}, panel-plugin/*.{c,h}, xfce4-mixer/*.{c,h}:
- Update FSF address in the GPL license headers.
-
-2008-10-31 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/*.{c,h}, panel-plugin/*.{c,h}, xfce4-mixer/*.{c,h}:
- Fix license headers, use GPL instead of LGPL everywhere.
-
-2008-10-19 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce4-mixer.desktop.in.in: Fix icon name. It has to be
- multimed-volume-control.
-
-2008-10-14 Olivier Fourdan <olivier at xfce.org>
-
- * xfce4-mixer/xfce-mixer.c: Fix build with gstreamer < 0.10.14.
-
-2008-10-13 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS: Update news for the first beta release. Translators will be
- mentioned explicitely in the release notes.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS: Update news again.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS: Update news.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/, panel-plugin/, xfce4-mixer/: Move the
- xfce_mixer_stock_init() call into xfce_mixer_init(). Rename the
- instance init function of XfceMixer to xfce_mixer_instance_init().
- Reorder the includes and only include libxfce4mixer.h of the
- header files in libxfce4mixer/.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/libxfce4mixer.c: Call gst_bus_remove_signal_watch() in
- xfce_mixer_shutdown().
- * xfce4-mixer/xfce-mixer-track.c: Remove locking mechanism from the
- lock button toggle handler.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * configure.in.in: Add DEBUG define for the DBG macro.
-
-2008-10-06 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/, panel-plugin/, xfce4-mixer/: Remove XfceMixerCard
- entirely and use GstMixer directly instead. Add methods
- xfce_mixer_init() and xfce_mixer_shutdown() to libxfce4mixer. Only
- determine the list of sound cards once inside xfce_mixer_init().
- Move code from xfce-mixer-utilities.{c,h} to libxfce4mixer.{c,h}.
- Use a single GstBus for all sound cards. Add new methods
- xfce_mixer_bus_connect() and xfce_mixer_bus_disconnect(). Move
- methods from XfceMixerCard to libxfce4menu.{c,h} and
- xfce-mixer-preferences.{c,h}. Update all the other classes so that
- they work with the new code.
- * po/xfce4-mixer.pot, po/*.po, po/POTFILES.in: Update POTFILES.in and
- the po files (no new strings have been added though).
-
-2008-10-05 Jannis Pohlmann <jannis at xfce.org>
-
- * configure.in.in: Depend on the latest version of xfconf.
-
-2008-10-05 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card.{c,h}: Remove the functions
- xfce_mixer_card_connect() and xfce_mixer_card_disconnect(). Add a
- new "track-changed" signal to XfceMixerCard instead. Make the
- element and display name members GObject properties. Rename
- xfce_mixer_card_get_message_owner() to
- xfce_mixer_card_is_message_owner() and make it static.
- * libxfce4mixer/xfce-mixer-preferences.c: Use xfconf_channel_get()
- instead of xfconf_channel_new(). Don't unref the channel in the
- finalize function.
- * panel-plugin/xfce-mixer-plugin.c: Make use of the new
- "track-changed" signal of XfceMixerCard.
- * xfce4-mixer/xfce-mixer.c: Make the card member of XfceMixer a
- GObject property. Make use of the new "track-changed" signal of
- XfceMixerCard. Move code from xfce_mixer_create_contents() into
- xfce_mixer_constructed().
-
-2008-09-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-plugin-dialog.c: Use multimedia-volume-control
- icon instead of xfce4-mixer icon.
-
-2008-09-20 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/, libxfce4mixer/xfce-mixer-stock{c,h},
- panel-plugin/xfce-volume-button.c: Update SVG and PNG icons. Add
- another icon with no volume bar at all for the ultra-low volume
- state between muted and 15% volume.
-
-2008-09-20 Jannis Pohlmann <jannis at xfce.org>
-
- * ChangeLog: Insert 4.5.90 release information at the correct location
- so that everyone can follow the changes made after that release.
-
-2008-09-20 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/main.c, xfce4-mixer/xfce-mixer-window.c,
- xfce4-mixer/xfce4-mixer.desktop.in.in: Don't use the word "Xfce" in
- the window title - be more generic and just call it "Mixer". Improve
- a few labels and tooltips. Oh, and most importantly: Improve the
- desktop file installed for the mixer application: Add the mixer to
- the Audio and X-XFCE categories, support startup notification and
- add Terminal=false.
-
-2008-09-20 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/, xfce4-mixer/xfce-mixer-window.c: Drop xfce4-mixer.{png,svg}
- icon in favour of multimedia-volume-control.
- * libxfce4mixer/xfce-mixer-card.{c,h}: Fix compiler warnings due to
- invalid conversion between "const gchar **" and "gchar * const *".
-
-2008-09-18 Jannis Pohlmann <jannis at xfce.org>
-
- * autogen.sh: Add git svn revision versioning support.
- * configure.in.in, libxfce4mixer/Makefile.am, xfce4-mixer/Makefile.am:
- Re-add svn version tag. Add dependency on xfconf.
- * libxfce4mixer/xfce-mixer-card.{c,h},
- libxfce4mixer/xfce-mixer-preferences.{c,h}, xfce4-mixer/main.c,
- xfce4-mixer/xfce-mixer-controls-dialog.c,
- xfce4-mixer/xfce-mixer-window.c, xfce4-mixer/xfce-mixer.c: Add
- xfconf support.
-
-2008-09-14 Jannis Pohlmann <jannis at xfce.org>
-
- * === 4.5.90 released ===
-
-2008-09-12 Jannis Pohlmann <jannis at xfce.org>
-
- * NEWS, README, TODO: Updated for the alpha release.
-
-2008-09-09 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/, panel-plugin/, xfce4-mixer/: Fix a lot of compiler
- warnings and return statements without a return value.
-
-2008-09-03 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card-combo.{c,h}: Remove the method
- xfce_mixer_card_combo_get_n_cards() again.
- * libxfce4mixer/xfce-mixer-track-combo.c: When assuming the first
- sound card (if no active sound card was passed to the constructor)
- first check whether the sound card list is empty.
- * libxfce4mixer/xfce-mixer-utilities.{c,h}: Introduce new method
- xfce_mixer_utilities_get_n_cards(). Only call
- xfce_mixer_card_set_ready() if there is a sound card with the given
- name in xfce_mixer_card_get_card_by_name(). Use internal name
- instead of the cards display name in the same function.
- * panel-plugin/xfce-mixer-plugin.c: Remember card connection id and
- properly disconnect from the GstBus when destroying the mixer
- plugin. Use command member of the plugin struct for the left-click
- action of the volume button (use "xfce4-mixer" by default).
- Dereference sound card and track when destroying the plugin. Display
- useful error dialog when the volume button is clicked but the
- left-click command is still undefined or empty. Don't allow
- configuration of the plugin unless GStreamer has actually detected
- at least one sound card. Avoid a warnings and crashes when no
- sound cards are detected.
- * panel-plugin/xfce-plugin-dialog.{c,h}: Make the left-click command
- configurable using an entry and a file chooser dialog. Use
- GtkAlignments were possible to make the look consistent with other
- Xfce settings dialogs.
- * panel-plugin/xfce4-mixer-plugin.desktop.in.in: Change plugin icon to
- "multimedia-volume-control" instead of "xfce4-mixer".
- * xfce4-mixer/main.c, xfce4-mixer/xfce-mixer-window.c: Display a
- useful error dialog and exit if no sound cards are available. Remove
- the same dialog from the mixer window in turn.
-
-2008-09-02 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer-window.c: Improve the previously added error
- message.
-
-2008-09-02 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card-combo. Add new method
- xfce_mixer_card_combo_get_n_cards().
- * xfce4-mixer/xfce-mixer-window.c: Display error dialog with a hint
- about sound specific GStreamer libraries if there were no sound
- cards detected by GStreamer.
-
-2008-09-01 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card.{c,h}: Add new method
- xfce_mixer_card_disconnect() and return the signal handler ID from
- xfce_mixer_card_connect().
- * xfce4-mixer/xfce-mixer.c: Disconnect from the XfceMixerCard in
- xfce_mixer_finalize(). This way there will be no GstBus messages
- sent to finalized XfceMixer objects any more. Fixes a bug on first
- startup.
-
-2008-09-01 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer.c: Add g_return_val_if_fail() call to
- xfce_mixer_bus_message() in order to return when an invalid mixer
- object is passed to the function.
-
-2008-09-01 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer.c: Connect to the GstBus after creating the
- mxier widgets, not before. This shouldn't change anything but it
- makes more sense to me.
-
-2008-08-31 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixe/xfce-mixer-card-combo.c,
- xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
- that it is selected again on next startup. Use
- xfce_mixer_card_get_name() instead of
- xfce_mixer_card_get_display_name() to determine the active card
- index in XfceMixerCardCombo.
-
-2008-08-10 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Use mute icon only if the
- mixer track is actually muted.
- * panel-plugin/xfce-plugin-dialog.c: Fix compiler warning due to
- missing gst/interfaces/mixer.h include.
-
-2008-07-17 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-preferences.c, xfce4-mixer/main.c,
- xfce4-mixer/xfce-mixer-window.c: Fix a few memory leaks.
-
-2008-06-23 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-track-combo.c,
- libxfce4mixer/xfce-mixer-card-combo.c,
- libxfce4mixer/xfce-mixer-utilities.c,
- panel-plugin/xfce-mixer-plugin.c,
- panel-plugin/xfce-plugin-dialog.c: Fix compiler warnings due
- to missing includes.
-
-2008-06-23 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card.c,
- panel-plugin/xfce-mixer-plugin.c: Fix a compiler warning and
- and an error.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card.c: Improve
- xfce_card_get_message_owner() by additionally comparing
- device names. I noticed that sometimes plugins are not
- updated even though the GstBus should invoke the signal
- handler. Hopefully, this fixes it.
- * libxfce4mixer/xfce-mixer-utilities.{c,h}: Add
- xfce_mixer_utilities_get_max_volume() to determine the
- maximum volume in a gint array.
- * panel-plugin/xfce-mixer-plugin.c: Don't call g_object_ref on
- GstMixerTracks. Add methods for setting the card and track
- used by the plugin. Improve the _update_track() method.
- Remove _replace_values() method. Add a lot of comments.
- * panel-plugin/xfce-plugin-dialog.c: Don't call g_object_ref on
- the GstMixerTrack in xfce_plugin_dialog_get_data().
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/scalable/: Improved again.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Ignore GstBus messages
- while applying changes to the active card/track to avoid
- conflicting states.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/: Revamp icons yet again.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/scalable/*.svg: Update icons. I think they look better
- this way.
- * panel-plugin/xfce-volume-button.c: Stop other "event-scroll"
- handlers from being invoked after handling them inside the
- volume button.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Add support for tooltips
- showing the currently used track and volume level in percent
- (e.g. 'Master: 50%').
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Preload icon pixbufs whenever
- the icon size is changed.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
- they are owned by GStreamer. That introduced a really, really
- weird bug ...
- * xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all
- faders.
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the
- fader of a mixer track with only one channel (which was
- caused by accessing the unitialized track->lock_button
- variable).
-
-2008-06-22 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer-track.{c,h},
- xfce4-mixer/xfce-mixer-option.{c,h},
- xfce4-mixer/xfce-mixer-switch.{c,h},
- xfce4-mixer/xfce-mixer.c: Implement monitoring for mute,
- record, volume, option and switch changes on all controls.
- Works like a charm!
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-card.c: Mark cards as ready when
- creating them. If the state is changed asynchroneously, wait
- until the state change is done before returning from
- xfce_mixer_card_set_state_ready().
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Remove the keyboard
- grabbing feature. It causes too much problems. People without
- a mousewheel will have to click the plugin and use the real
- mixer for now.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-track-combo.c: Increment the counter
- for determining the active track index only when playback
- and capture tracks are found.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.{c,h}: Add "mute-toggled"
- signal for when the middle mouse button is clicked. Add
- xfce_volume_button_set_muted() method for manually changing
- the mute state of the button (does not affect the actual sound
- settings).
- * panel-plugin/xfce-mixer-plugin.c: Handle
- GST_MESSAGE_MUTE_TOGGLED messages by setting the muted state
- of the plugin button.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Add support for
- xfce_mixer_card_connect() so that the volume button is updated
- whenever the volume of the current mixer track is changed by
- another program.
- * panel-plugin/xfce-mixer.c: Parse GST_MESSAGE_VOLUME_CHANGED
- messages, but don't handle them yet. In the mixer it's much more
- complicated than in the plugin, gonna do that later.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * icons/: Add volume level icons (1x muted, 5x different sound
- wave icons). I'm not exactly satisfied, but it's better than
- before.
- * libxfce4mixer/xfce-mixer-stock.{c,h}: Add support for the
- icons mentioned above.
- * panel-plugin/xfce-mixer-plugin.c,
- panel-plugin/xfce-volume-button.c,
- panel-plugin/xfce-plugin-dialog.c: (Hopefully) improve icon
- scaling. Make sure (I guess) not to crash when the properties
- dialog returns crap (why would it? heck, what do I know?).
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/xfce-mixer-track-combo.c: Fix a wrong
- if-statement in xfce_mixer_track_combo_set_track(). Now the
- current mixer track should be preselected correctly when
- opening the properties dialog of the plugin.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Fix the button press
- callback: Return TRUE when the middle button was pressed,
- return FALSE otherwise.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Add support for toggling
- between minimum and last known volume using the middle
- mouse button.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-volume-button.c: Add support for GDK_Home
- and GDK_End for changing the volume to the maximum/minimum
- level.
-
-2008-06-21 Jannis Pohlmann <jannis at xfce.org>
-
- * libxfce4mixer/Makefile.am,
- libxfce4mixer/xfce-mixer-card-combo.{c,h},
- libxfce4mixer/xfce-mixer-track-combo.{c,h},
- libxfce4mixer/xfce-mixer-utilities.{c,h}:
- Add subclasses of GtkComboBox for unified selection of
- sound cards and mixer tracks. Add convenience functions for
- getting a list of available sound cards and getting sound
- cards by name.
- * panel-plugin/Makefile.am,
- panel-plugin/xfce-mixer-plugin.{c,h},
- panel-plugin/xfce-plugin-dialog.{c,h},
- panel-plugin/xfce-volume-button.{c,h}:
- Implement the properties dialog of the plugin. By now it
- makes it possible to select which sound card and mixer track
- to use. Also connect the plugin to GStreamer, so it actually
- does something. Add support for reading/writing the plugin
- configuration to the rc file. The volume button itself has
- some focus grabbing problems: sometimes other windows don't
- receive the focus even when the pointer leaves the button.
- * xfce4-mixer/xfce-mixer-window.c: Move the _load_soundcards
- method to the libxfce4mixer. Make use of the new
- XfceMixerCardCombo in XfceMixerWindow.
-
-2008-06-19 Jannis Pohlmann <jannis at xfce.org>
-
- * panel-plugin/xfce-mixer-plugin.c: Try to start "xfce4-mixer"
- when the plugin button is clicked.
-
-2008-06-19 Jannis Pohlmann <jannis at xfce.org>
-
- * Huge code reorganization: Split the mixer into three parts:
- libxfce4mixer, xfce4-mixer and the panel plugin. libxfce4mixer
- contains everything that's needed by both, the mixer and the
- plugin.
- * panel-plugin/: This will become a minimalistic, keyboard and
- scroll-wheel orientated plugin with no volume popup slider or
- whatsoever. I'll have to add this later. Still missing: config
- dialog and the connection to the soundcard.
- * xfce4-mixer/: I don't think I've changed anything in here, just
- reorganized the code.
-
-2008-01-14 Jannis Pohlmann <jannis at xfce.org>
-
- * configure.in.in: Add support for version information, just like all
- the other Xfce components have. Also add special debugging support
- for SVN snapshots. Enhance the AC_COPYRIGHT value. Print build
- configuration at the end of ./configure.
-
-2008-01-14 Jannis Pohlmann <jannis at xfce.org>
-
- * configure.in.in, xfce4-mixer/xfce-mixer-card.{c,h},
- xfce4-mixer/xfce-mixer.c: Add optional support for the GstMixer
- notification API. It uses GstBus and GstMixerMessages. The latter
- are only available with GStreamer >= 0.10.14. Not all work is done
- yet, but it will be worked on this week.
- * autogen.sh: Tweak autogen.sh so that it works with both, SVN and
- git-svn.
-
-2008-01-13 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer-card.{c,h}: Add XfceMixerCard class as a wrapper for
- GstMixer. Implement a method (xfce_mixer_card_get_name()) to
- work-around problems with sound card names containing characters
- not allowed as section names (see Desktop Entry specification).
- This method is now used to store/load preferences of soundcards.
- * xfce4-mixer/xfce-mixer.{c,h},
- xfce4-mixer/xfce-mixer-controls-dialog.{c,h},
- xfce4-mixer/xfce-mixer-option.{c,h},
- xfce4-mixer/xfce-mixer-switch.{c,h},
- xfce4-mixer/xfce-mixer-track.{c,h}
- xfce4-mixer/xfce-mixer-window.{c,h}: Use XfceMixerCard instead of
- GstMixer everywhere. Change the main window subtitle to something
- less enthusiastic.
-
-2008-01-13 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-mixer/xfce-mixer-controls-dialog.c: Don't set the default
- response of the dialog.
-
-2008-01-13 Jannis Pohlmann <jannis at xfce.org>
-
- * Initial import of the new GStreamer-based mixer into trunk.
-
-vim:set sw=8 sts=8 ts=8 noexpandtab:
diff --git a/Makefile.am b/Makefile.am
index d278eec..ef3a48a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,21 @@
-# $Id$
-#
-# vi:set ts=8 sw=8 noet ai nocindent:
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# -
+# Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
@SET_MAKE@
@@ -22,6 +37,15 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
+.PHONY: ChangeLog
+
+ChangeLog: Makefile
+ (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
+ && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+ || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
EXTRA_DIST = \
AUTHORS \
ChangeLog \
diff --git a/NEWS b/NEWS
index d1d8ace..06eed79 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+4.8.0
+=====
+- Fix too small plugin button in the new panel.
+- Ellipsize sound card names in the combo box (bug #6671).
+- Remove deprecated Encoding key from desktop files.
+- Port to libxfce4ui.
+- Fix wrong use of GTK+ causing the panel plugin volume to be set no higher
+ than 90% (bug #5243).
+- Fixed a lot of compiler warnnings and errors.
+- Updated translations: Dutch, English (United Kingdom), Galician, Greek,
+ Italian, Kazakh, Portuguese, Romanian, Russian, Sinhala, Turkish,
+ Uyghur and more.
+
+
4.6.1
=====
- Translation updates: es (Abel Martín), pl (Piotr Sokół),
diff --git a/autogen.sh b/autogen.sh
index 35f789f..2c644e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,24 @@
#!/bin/sh
#
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
+#-
+# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
#
-# vi:set ts=2 sw=2 et ai:
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Copyright (c) 2008 Jannis Pohlmann <jannis at xfce.org>
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
-# Check if xdt-autogen is installed
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
@@ -18,34 +29,4 @@ EOF
exit 1
}
-# Verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-# Substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
- revision=`git svn find-rev trunk 2>/dev/null ||
- git svn find-rev origin/trunk 2>/dev/null ||
- git svn find-rev HEAD 2>/dev/null ||
- git svn find-rev master 2>/dev/null`
-elif test -f .svn; then
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-else
- revision=""
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
-
-# xdt-autogen clean does not remove all generated files
-(test x"clean" = x"$1") && {
- rm -rf configure.in
-} || true
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 2bc6847..0f3f977 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,14 +1,28 @@
-dnl $Id$
-dnl
-dnl Copyright (c) 2006 - Jannis Pohlmann <jannis at xfce.org>
-dnl
+# vi:set et ai sw=2 sts=2 ts=2: */
+#-
+# Copyright (c) 2008-2011 Jannis Pohlmann <jannis at xfce.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([xfce4_mixer_version_major], [4])
-m4_define([xfce4_mixer_version_minor], [6])
-m4_define([xfce4_mixer_version_micro], [1])
+m4_define([xfce4_mixer_version_minor], [8])
+m4_define([xfce4_mixer_version_micro], [0])
m4_define([xfce4_mixer_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_mixer_version_build], [r at REVISION@])
m4_define([xfce4_mixer_version_tag], [])
@@ -22,10 +36,7 @@ m4_define([mixer_debug_default], [ifelse(xfce4_mixer_version_tag(), [svn], [full
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2008-2009
- The Xfce development team. All rights reserved.
-
-Written for Xfce by Jannis Pohlmann <jannis at xfce.org>.])
+AC_COPYRIGHT([Copyright (c) 2008-2011 Jannis Pohlmann <jannis at xfce.org>.])
AC_INIT([xfce4-mixer], [xfce4_mixer_version], [http://bugzilla.xfce.org/], [xfce4-mixer])
AC_REVISION([$Id$])
AC_PREREQ([2.50])
@@ -72,14 +83,14 @@ XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
XDT_CHECK_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.2])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
dnl **************************************
dnl *** Check for GstMixer bus support ***
@@ -97,63 +108,25 @@ fi
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@],
- [Turn on debugging @<:@default=mixer_debug_default@:>@]),
- [], [enable_debug=mixer_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Define debug for libxfce4util DBG macro
- AC_DEFINE([DEBUG], [1], [Define for debugging support])
-
- dnl Make sure we detect possible errors (if supported)
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wall -Werror"
- AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror"
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
-
- dnl Paranoia for --enable-debug=full
- if test x"$enable_debug" = x"full"; then
- dnl Enable extensive debugging
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
-
- dnl Use -O0 -g3 if the compiler supports it
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -O0 -g3"
- AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
- fi
-else
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Disable debugging (release build)
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG"
-
- dnl Disable object cast checks
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
- dnl Disable all checks for --enable-debug=no
- if test x"$enable_debug" = x"no"; then
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
- fi
-fi
+XDT_FEATURE_DEBUG(mixer_debug_default)
+dnl **************************************
+dnl *** Check for linker optimizations ***
+dnl **************************************
+XDT_FEATURE_LINKER_OPTS()
+
+dnl *********************************
+dnl *** Substitute platform flags ***
+dnl *********************************
+AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
+AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS])
+AC_MSG_CHECKING([PLATFORM_CFLAGS])
+AC_MSG_RESULT([$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_CFLAGS])
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
AC_OUTPUT([
Makefile
@@ -180,4 +153,5 @@ echo " * GStreamer mixer notification support: yes"
else
echo " * GStreamer mixer notification support: no"
fi
+echo " * Debug Support: $enable_debug"
echo
diff --git a/libxfce4mixer/xfce-mixer-card-combo.c b/libxfce4mixer/xfce-mixer-card-combo.c
index db94866..28fe134 100644
--- a/libxfce4mixer/xfce-mixer-card-combo.c
+++ b/libxfce4mixer/xfce-mixer-card-combo.c
@@ -51,8 +51,6 @@ static guint combo_signals[LAST_SIGNAL];
static void xfce_mixer_card_combo_class_init (XfceMixerCardComboClass *klass);
static void xfce_mixer_card_combo_init (XfceMixerCardCombo *combo);
static void xfce_mixer_card_combo_finalize (GObject *object);
-static void xfce_mixer_card_combo_load_soundcards (XfceMixerCardCombo *combo,
- const gchar *card_name);
static void xfce_mixer_card_combo_changed (XfceMixerCardCombo *combo);
static void _xfce_mixer_card_combo_set_active_card (XfceMixerCardCombo *combo,
GstElement *card);
diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c
index af26ba2..2308c2e 100644
--- a/panel-plugin/xfce-mixer-plugin.c
+++ b/panel-plugin/xfce-mixer-plugin.c
@@ -366,9 +366,7 @@ xfce_mixer_plugin_clicked (XfceMixerPlugin *mixer_plugin)
mixer_plugin->command);
/* Display error */
- xfce_dialog_show_error (NULL,
- NULL,
- message);
+ xfce_dialog_show_error (NULL, NULL, "%s", message);
/* Free error message */
g_free (message);
@@ -577,12 +575,9 @@ xfce_mixer_plugin_bus_message (GstBus *bus,
XfceMixerPlugin *mixer_plugin)
{
GstMixerTrack *track = NULL;
- gdouble volume;
- gchar *label;
- gint *volumes;
- gint num_channels;
gboolean mute;
gboolean record;
+ gchar *label;
/* Don't do anything if GstBus messages are to be ignored */
if (G_UNLIKELY (mixer_plugin->ignore_bus_messages))
diff --git a/panel-plugin/xfce-plugin-dialog.c b/panel-plugin/xfce-plugin-dialog.c
index cf099aa..b6e627b 100644
--- a/panel-plugin/xfce-plugin-dialog.c
+++ b/panel-plugin/xfce-plugin-dialog.c
@@ -226,8 +226,6 @@ xfce_plugin_dialog_create_contents (XfcePluginDialog *dialog,
GtkWidget *hbox;
GtkWidget *button;
GtkWidget *label;
- GtkWidget *card_frame;
- GtkWidget *track_frame;
gchar *title;
gtk_window_set_icon_name (GTK_WINDOW (dialog), "multimedia-volume-control");
diff --git a/panel-plugin/xfce-volume-button.c b/panel-plugin/xfce-volume-button.c
index 67dc781..d09f56e 100644
--- a/panel-plugin/xfce-volume-button.c
+++ b/panel-plugin/xfce-volume-button.c
@@ -241,7 +241,7 @@ xfce_volume_button_dispose (GObject *object)
static void
xfce_volume_button_finalize (GObject *object)
{
- gint i;
+ guint i;
XfceVolumeButton *button = XFCE_VOLUME_BUTTON (object);
@@ -404,7 +404,7 @@ xfce_volume_button_update (XfceVolumeButton *button)
gdouble lower;
gdouble value;
gdouble range;
- gint i;
+ guint i;
g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button));
@@ -479,7 +479,7 @@ void
xfce_volume_button_set_icon_size (XfceVolumeButton *button,
gint size)
{
- gint i;
+ guint i;
g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button));
g_return_if_fail (size >= 0);
diff --git a/xfce4-mixer/xfce-mixer-controls-dialog.c b/xfce4-mixer/xfce-mixer-controls-dialog.c
index c1ba813..b9b851b 100644
--- a/xfce4-mixer/xfce-mixer-controls-dialog.c
+++ b/xfce4-mixer/xfce-mixer-controls-dialog.c
@@ -190,7 +190,7 @@ xfce_mixer_controls_dialog_response (GtkDialog *dialog,
XfceMixerPreferences *preferences;
GList *visible_controls = NULL;
gchar **controls;
- gint i;
+ guint i;
gtk_tree_model_foreach (GTK_TREE_MODEL (mixer_dialog->store),
(GtkTreeModelForeachFunc) xfce_mixer_controls_dialog_collect_visible_controls,
@@ -250,7 +250,6 @@ xfce_mixer_controls_dialog_create_contents (XfceMixerControlsDialog *dialog)
GtkWidget *view;
GtkWidget *frame;
GtkWidget *scrollwin;
- GList *item;
gchar *label;
gboolean visible;
diff --git a/xfce4-mixer/xfce-mixer-option.c b/xfce4-mixer/xfce-mixer-option.c
index 709e1e4..aba21dd 100644
--- a/xfce4-mixer/xfce-mixer-option.c
+++ b/xfce4-mixer/xfce-mixer-option.c
@@ -130,9 +130,6 @@ xfce_mixer_option_dispose (GObject *object)
static void
xfce_mixer_option_finalize (GObject *object)
{
- XfceMixerOption *option = XFCE_MIXER_OPTION (object);
-
- (*G_OBJECT_CLASS (xfce_mixer_option_parent_class)->finalize) (object);
}
@@ -215,7 +212,8 @@ xfce_mixer_option_changed (GtkComboBox *combo,
if (G_LIKELY (active_option != NULL))
{
- gst_mixer_set_option (GST_MIXER (option->card), option->track, active_option);
+ gst_mixer_set_option (GST_MIXER (option->card), GST_MIXER_OPTIONS (option->track),
+ active_option);
g_free (active_option);
}
}
diff --git a/xfce4-mixer/xfce-mixer-switch.c b/xfce4-mixer/xfce-mixer-switch.c
index c759b7f..38e576f 100644
--- a/xfce4-mixer/xfce-mixer-switch.c
+++ b/xfce4-mixer/xfce-mixer-switch.c
@@ -130,8 +130,6 @@ xfce_mixer_switch_dispose (GObject *object)
static void
xfce_mixer_switch_finalize (GObject *object)
{
- XfceMixerSwitch *mixer_switch = XFCE_MIXER_SWITCH (object);
-
(*G_OBJECT_CLASS (xfce_mixer_switch_parent_class)->finalize) (object);
}
diff --git a/xfce4-mixer/xfce-mixer-track.c b/xfce4-mixer/xfce-mixer-track.c
index f015349..82b412b 100644
--- a/xfce4-mixer/xfce-mixer-track.c
+++ b/xfce4-mixer/xfce-mixer-track.c
@@ -150,8 +150,6 @@ xfce_mixer_track_dispose (GObject *object)
static void
xfce_mixer_track_finalize (GObject *object)
{
- XfceMixerTrack *track = XFCE_MIXER_TRACK (object);
-
(*G_OBJECT_CLASS (xfce_mixer_track_parent_class)->finalize) (object);
}
diff --git a/xfce4-mixer/xfce-mixer-window.c b/xfce4-mixer/xfce-mixer-window.c
index 05aa532..acbc67f 100644
--- a/xfce4-mixer/xfce-mixer-window.c
+++ b/xfce4-mixer/xfce-mixer-window.c
@@ -154,9 +154,9 @@ xfce_mixer_window_init (XfceMixerWindow *window)
GtkWidget *bbox;
gchar *active_card = NULL;
gchar *title;
+ guint i;
gint width;
gint height;
- gint i;
window->preferences = xfce_mixer_preferences_get ();
diff --git a/xfce4-mixer/xfce-mixer.c b/xfce4-mixer/xfce-mixer.c
index 8d3ffcd..ddcade7 100644
--- a/xfce4-mixer/xfce-mixer.c
+++ b/xfce4-mixer/xfce-mixer.c
@@ -169,7 +169,6 @@ xfce_mixer_constructed (GObject *object)
GtkWidget *last_separator[4] = { NULL, NULL, NULL, NULL };
GtkWidget *label1;
GtkWidget *label2;
- GList *visible_controls;
gchar *label;
guint num_children[4] = { 0, 0, 0, 0 };
gint i;
@@ -385,11 +384,15 @@ xfce_mixer_set_property (GObject *object,
GtkWidget *
xfce_mixer_new (GstElement *card)
{
+ GObject *object = NULL;
+
g_return_val_if_fail (GST_IS_MIXER (card), NULL);
- GObject *object = g_object_new (TYPE_XFCE_MIXER, "card", card, NULL);
+
+ object = g_object_new (TYPE_XFCE_MIXER, "card", card, NULL);
#if !GLIB_CHECK_VERSION (2,14,0)
xfce_mixer_constructed (object);
#endif
+
return GTK_WIDGET (object);
}
More information about the Xfce4-commits
mailing list