[Xfce4-commits] r26561 - xfce4-mixer/branches
Author: jannis Date: 2008-01-13 16:26:02 + (Sun, 13 Jan 2008) New Revision: 26561 Added: xfce4-mixer/branches/trunk_before_gstreamer_mixer/ Log: Make a backup of current trunk (as a branch). Copied: xfce4-mixer/branches/trunk_before_gstreamer_mixer (from rev 26560, xfce4-mixer/trunk) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26563 - xfce4-mixer/trunk
Author: jannis Date: 2008-01-13 16:37:35 + (Sun, 13 Jan 2008) New Revision: 26563 Removed: xfce4-mixer/trunk/po/ Log: Temporarily remove the po directory ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26564 - in xfce4-mixer/trunk: . po
Author: jannis Date: 2008-01-13 16:37:58 + (Sun, 13 Jan 2008) New Revision: 26564 Added: xfce4-mixer/trunk/po/ xfce4-mixer/trunk/po/ChangeLog xfce4-mixer/trunk/po/LINGUAS xfce4-mixer/trunk/po/POTFILES.in xfce4-mixer/trunk/po/de.po Log: Here it is again. Added: xfce4-mixer/trunk/po/ChangeLog === Added: xfce4-mixer/trunk/po/LINGUAS === --- xfce4-mixer/trunk/po/LINGUAS(rev 0) +++ xfce4-mixer/trunk/po/LINGUAS2008-01-13 16:37:58 UTC (rev 26564) @@ -0,0 +1 @@ +de Added: xfce4-mixer/trunk/po/POTFILES.in === --- xfce4-mixer/trunk/po/POTFILES.in(rev 0) +++ xfce4-mixer/trunk/po/POTFILES.in2008-01-13 16:37:58 UTC (rev 26564) @@ -0,0 +1,7 @@ +xfce4-mixer/main.c +xfce4-mixer/xfce-mixer.c +xfce4-mixer/xfce-mixer-track.c +xfce4-mixer/xfce-mixer-track-type.c +xfce4-mixer/xfce-mixer-window.c +xfce4-mixer/xfce4-mixer.desktop.in.in +xfce4-mixer/xfce-mixer-controls-dialog.c Added: xfce4-mixer/trunk/po/de.po === --- xfce4-mixer/trunk/po/de.po (rev 0) +++ xfce4-mixer/trunk/po/de.po 2008-01-13 16:37:58 UTC (rev 26564) @@ -0,0 +1,89 @@ +# German translations for xfce4-mixer. +# Copyright (C) 2008 Jannis Pohlmann [EMAIL PROTECTED]. +# This file is distributed under the same license as the xfce4-mixer package. +# Jannis Pohlmann [EMAIL PROTECTED], 2008. +# +msgid +msgstr +Project-Id-Version: xfce4-mixer SVN\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2008-01-08 05:46+0100\n +PO-Revision-Date: 2008-01-06 04:59+0100\n +Last-Translator: Jannis Pohlmann [EMAIL PROTECTED]\n +Language-Team: German [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=utf-8\n +Content-Transfer-Encoding: 8bit\n + +#. Set application name +#: ../xfce4-mixer/main.c:75 ../xfce4-mixer/xfce-mixer-window.c:181 +#: ../xfce4-mixer/xfce-mixer-window.c:199 +#: ../xfce4-mixer/xfce-mixer-window.c:362 +#: ../xfce4-mixer/xfce-mixer-window.c:367 +#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2 +msgid Xfce Mixer +msgstr Xfce-Lautstärkeregelung + +#: ../xfce4-mixer/xfce-mixer.c:168 +msgid Playback +msgstr Wiedergabe + +#: ../xfce4-mixer/xfce-mixer.c:168 +msgid Capture +msgstr Aufnahme + +#: ../xfce4-mixer/xfce-mixer.c:168 +msgid Switches +msgstr Schalter + +#: ../xfce4-mixer/xfce-mixer.c:168 +msgid Options +msgstr Optionen + +#: ../xfce4-mixer/xfce-mixer.c:300 +msgid No Controls Visible +msgstr Keine Bedienelemente sichtbar + +#: ../xfce4-mixer/xfce-mixer.c:304 +msgid +No controls are marked as visible. Please open the span +size='large'bSelect Controls/b/span dialog to select some. +msgstr +Es sind keine Bedienelemente als sichtbar vermerkt. Bitte benutze den Dialog +span size='large'bElemente auswählen/b/span, damit etwas angezeigt +wird. + +#: ../xfce4-mixer/xfce-mixer-window.c:94 +msgid _Quit +msgstr B_eenden + +#: ../xfce4-mixer/xfce-mixer-window.c:94 +msgid Exit Xfce Mixer +msgstr Beende die Xfce Lautstärkeregelung + +#: ../xfce4-mixer/xfce-mixer-window.c:96 +msgid _Select Controls... +msgstr Elemente au_swählen... + +#: ../xfce4-mixer/xfce-mixer-window.c:96 +msgid Select which controls are displayed +msgstr Auswählen, welche Bedienelemente angezeigt werden + +#: ../xfce4-mixer/xfce-mixer-window.c:200 +msgid A reliable and comfortable mixer for your soundcard, finally! +msgstr +Endlich! Eine zuverlässige und komfortable Lautstärkeregelung für deine +Soundkarte! + +#: ../xfce4-mixer/xfce-mixer-window.c:215 +msgid Sound card: +msgstr Soundkarte: + +#: ../xfce4-mixer/xfce-mixer-window.c:437 +#, c-format +msgid Unknown Volume Control %d +msgstr Unbekanntes Element %d + +#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1 +msgid Audio mixer for the Xfce Desktop Environment +msgstr Lautstärkeregelung für Xfce ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26565 - in xfce4-mixer/trunk: . xfce4-mixer
Author: jannis Date: 2008-01-13 16:43:37 + (Sun, 13 Jan 2008) New Revision: 26565 Modified: xfce4-mixer/trunk/ChangeLog xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c Log: * xfce4-mixer/xfce-mixer-controls-dialog.c: Don't set the default response of the dialog. Modified: xfce4-mixer/trunk/ChangeLog === --- xfce4-mixer/trunk/ChangeLog 2008-01-13 16:37:58 UTC (rev 26564) +++ xfce4-mixer/trunk/ChangeLog 2008-01-13 16:43:37 UTC (rev 26565) @@ -1,5 +1,10 @@ 2008-01-13 Jannis Pohlmann [EMAIL PROTECTED] + * xfce4-mixer/xfce-mixer-controls-dialog.c: Don't set the default + response of the dialog. + +2008-01-13 Jannis Pohlmann [EMAIL PROTECTED] + * Initial import of the new GStreamer-based mixer into trunk. vim:set sw=8 sts=8 ts=8 noexpandtab: Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c === --- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c 2008-01-13 16:37:58 UTC (rev 26564) +++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c 2008-01-13 16:43:37 UTC (rev 26565) @@ -135,8 +135,6 @@ button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CLOSE); gtk_widget_show (button); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26567 - in xfce4-mixer/trunk: . xfce4-mixer
Author: jannis Date: 2008-01-14 00:47:17 + (Mon, 14 Jan 2008) New Revision: 26567 Added: xfce4-mixer/trunk/.gitignore Modified: xfce4-mixer/trunk/ChangeLog xfce4-mixer/trunk/TODO xfce4-mixer/trunk/autogen.sh xfce4-mixer/trunk/configure.in.in xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-card.c xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-card.h xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c Log: * 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. Added: xfce4-mixer/trunk/.gitignore === --- xfce4-mixer/trunk/.gitignore(rev 0) +++ xfce4-mixer/trunk/.gitignore2008-01-14 00:47:17 UTC (rev 26567) @@ -0,0 +1,27 @@ +*.o +ltmain.sh +mkinstalldirs +depcomp +*.gmo +Makefile.in.in +.intltool-merge-cache +configure.in +libtool +configure +Makefile +Makefile.in +xfce4-mixer.desktop +intltool-* +config.* +stamp-it +stamp-h1 +POTFILES +*.m4 +*.swp +.deps +.libs +xfce4-mixer +missing +install-sh +compile +autom4te* Modified: xfce4-mixer/trunk/ChangeLog === --- xfce4-mixer/trunk/ChangeLog 2008-01-13 19:27:18 UTC (rev 26566) +++ xfce4-mixer/trunk/ChangeLog 2008-01-14 00:47:17 UTC (rev 26567) @@ -1,3 +1,13 @@ +2008-01-14 Jannis Pohlmann [EMAIL PROTECTED] + + * 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 [EMAIL PROTECTED] * xfce4-mixer-card.{c,h}: Add XfceMixerCard class as a wrapper for Modified: xfce4-mixer/trunk/TODO === --- xfce4-mixer/trunk/TODO 2008-01-13 19:27:18 UTC (rev 26566) +++ xfce4-mixer/trunk/TODO 2008-01-14 00:47:17 UTC (rev 26567) @@ -1,5 +1,11 @@ -* Monitor for changes and update the controls according to them +* Monitor for changes and update the controls according to them: + 1) Add GHashTable for (track name = mixer widget) lookup + 2) Extend xfce_mixer_bus_message() to handle all types of messages + by updating the corresponding mixer widgets + * Write panel plugin + * Write MCS plugin (or go the xfconf way) + * Allow changing controls from the console, probably via something like: --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE Modified: xfce4-mixer/trunk/autogen.sh === --- xfce4-mixer/trunk/autogen.sh2008-01-13 19:27:18 UTC (rev 26566) +++ xfce4-mixer/trunk/autogen.sh2008-01-14 00:47:17 UTC (rev 26567) @@ -1,7 +1,7 @@ #!/bin/sh # # $Id$ - +# # vi:set ts=2 sw=2 et ai: # # Copyright (c) 2008 Jannis Pohlmann [EMAIL PROTECTED] @@ -29,6 +29,20 @@ # Substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` -sed -e s/@LINGUAS@/${linguas}/g configure.in.in configure.in +if test -d .git/svn; then + revision=`LC_ALL=C git-svn find-rev HEAD` +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 xclean = x$1) { + rm -rf configure.in +} || true Modified: xfce4-mixer/trunk/configure.in.in === --- xfce4-mixer/trunk/configure.in.in 2008-01-13 19:27:18 UTC (rev 26566) +++ xfce4-mixer/trunk/configure.in.in 2008-01-14 00:47:17 UTC (rev 26567) @@ -60,6 +60,19 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +dnl ** +dnl *** Check for GstMixer bus support *** +dnl ** +HAVE_GST_MIXER_NOTIFICATION=no +PKG_CHECK_MODULES(GST_MIXER_NOTIFICATION_API, + gstreamer-plugins-base-0.10 = 0.10.14, + HAVE_GST_MIXER_NOTIFICATION=yes, + HAVE_GST_MIXER_NOTIFICATION=no) +if test x$HAVE_GST_MIXER_NOTIFICATION = xyes; then + AC_DEFINE(HAVE_GST_MIXER_NOTIFICATION, 1, +[Have GStreamer mixer notification API]) +fi +
[Xfce4-commits] r26568 - xfce4-panel/trunk
Author: jannis Date: 2008-01-14 01:09:43 + (Mon, 14 Jan 2008) New Revision: 26568 Modified: xfce4-panel/trunk/ChangeLog xfce4-panel/trunk/configure.in.in Log: * configure.in.in: Fix debugging support for SVN snapshots. Until now the default setting never was applied. * libxfce4panel/xfce-panel-plugin-iface.c, panel/panel-properties.c: To prevent panel items from increasing the panel size, set the height of the XfceItembar instead of setting the size specifically for all items. * libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be NULL in call to xfce_panel_plugin_position_widget() and fix up the API documentation. Patch by Diego Ongaro and a few bits from me. * plugins/windowlist/windowlist.c: fix for popup menu at pointer position. Another patch by Diego. * libxfce4panel/*, docs/API/*: Remove the html and xml directories, those are generated by gtk-doc, 100% symbol coverage and improve the layout of the chapters. * plugins/clock/clock-digital.c: Allow markup and center the string. * plugins/clock/*: Move the localtime functions into 1 util and allow usage without locatime_r. * plugins/clock/clock-lcd.c: Typo, the 8 was test code. * plugins/clock/*: Import code. * NEWS: update. * Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as new dependency. * po/*: Merge new strings. * libxfce4panel/xfce-panel-macros.h: Add macros to disable debugging for release builds. Modified: xfce4-panel/trunk/ChangeLog === --- xfce4-panel/trunk/ChangeLog 2008-01-14 00:47:17 UTC (rev 26567) +++ xfce4-panel/trunk/ChangeLog 2008-01-14 01:09:43 UTC (rev 26568) @@ -1,14 +1,19 @@ +2008-01-14 02:08 jannis + + * configure.in.in: Fix debugging support for SVN snapshots. Until now + the default setting never was applied. + 2007-10-01 21:21 jasper -* libxfce4panel/xfce-panel-plugin-iface.c, - panel/panel-properties.c: To prevent panel items from increasing the - panel size, set the height of the XfceItembar instead of setting the - size specifically for all items. -* libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be - NULL in call to xfce_panel_plugin_position_widget() and fix up the - API documentation. Patch by Diego Ongaro and a few bits from me. -* plugins/windowlist/windowlist.c: fix for popup menu at pointer - position. Another patch by Diego. + * libxfce4panel/xfce-panel-plugin-iface.c, + panel/panel-properties.c: To prevent panel items from increasing the + panel size, set the height of the XfceItembar instead of setting the + size specifically for all items. + * libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be + NULL in call to xfce_panel_plugin_position_widget() and fix up the + API documentation. Patch by Diego Ongaro and a few bits from me. + * plugins/windowlist/windowlist.c: fix for popup menu at pointer + position. Another patch by Diego. 2007-09-30 20:14 jasper @@ -38,27 +43,27 @@ 2007-07-09 22:45 nick - * libxfce4panel/*, docs/API/*: Remove the html and xml directories, - those are generated by gtk-doc, 100% symbol coverage and improve - the layout of the chapters. + * libxfce4panel/*, docs/API/*: Remove the html and xml directories, + those are generated by gtk-doc, 100% symbol coverage and improve + the layout of the chapters. 2007-07-08 12:00 nick - * plugins/clock/clock-digital.c: Allow markup and center the string. - * plugins/clock/*: Move the localtime functions into 1 util and allow - usage without locatime_r. + * plugins/clock/clock-digital.c: Allow markup and center the string. + * plugins/clock/*: Move the localtime functions into 1 util and allow + usage without locatime_r. 2007-07-07 10:32 nick - * plugins/clock/clock-lcd.c: Typo, the 8 was test code. + * plugins/clock/clock-lcd.c: Typo, the 8 was test code. 2007-07-06 10:50 nick - * plugins/clock/*: Import code. - * NEWS: update. - * Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as - new dependency. - * po/*: Merge new strings. + * plugins/clock/*: Import code. + * NEWS: update. + * Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as + new dependency. + * po/*: Merge new strings. 2007-05-27 10:50 nick @@ -113,8 +118,8 @@ 2007-03-18 15:23 nick * libxfce4panel: Add visibility support to reduce the library size a bit. -* libxfce4panel/xfce-panel-macros.h: Add macros to disable debugging for - release
[Xfce4-commits] r26569 - xfce4-mixer/trunk
Author: jannis Date: 2008-01-14 01:14:09 + (Mon, 14 Jan 2008) New Revision: 26569 Modified: xfce4-mixer/trunk/ChangeLog xfce4-mixer/trunk/configure.in.in Log: * 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. Modified: xfce4-mixer/trunk/ChangeLog === --- xfce4-mixer/trunk/ChangeLog 2008-01-14 01:09:43 UTC (rev 26568) +++ xfce4-mixer/trunk/ChangeLog 2008-01-14 01:14:09 UTC (rev 26569) @@ -1,5 +1,12 @@ 2008-01-14 Jannis Pohlmann [EMAIL PROTECTED] + * 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 [EMAIL PROTECTED] + * 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 Modified: xfce4-mixer/trunk/configure.in.in === --- xfce4-mixer/trunk/configure.in.in 2008-01-14 01:09:43 UTC (rev 26568) +++ xfce4-mixer/trunk/configure.in.in 2008-01-14 01:14:09 UTC (rev 26569) @@ -4,10 +4,29 @@ dnl dnl *** +dnl *** Version information *** +dnl *** +m4_define([xfce4_mixer_version_major], [4]) +m4_define([xfce4_mixer_version_minor], [5]) +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], [EMAIL PROTECTED]@]) +m4_define([xfce4_mixer_version_tag], [svn]) +m4_define([xfce4_mixer_version], [xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(), [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [svn], [xfce4_mixer_version_tag()-xfce4_mixer_version_build()], [xfce4_mixer_version_tag()])]) + +dnl *** +dnl *** Debugging support for SVN snapshots *** +dnl *** +m4_define([mixer_debug_default], [ifelse(xfce4_mixer_version_tag(), [svn], [full], [minimum])]) + +dnl *** dnl *** Initialize autoconf *** dnl *** -AC_COPYRIGHT([Copyright (c) 2007 Jannis Pohlmann [EMAIL PROTECTED]]) -AC_INIT([xfce4-mixer], [4.5.0], [EMAIL PROTECTED], [xfce4-mixer]) +AC_COPYRIGHT([Copyright (c) 2008 +The Xfce development team. All rights reserved. + +Written for Xfce by Jannis Pohlmann [EMAIL PROTECTED].]) +AC_INIT([xfce4-mixer], [xfce4_mixer_version], [http://bugzilla.xfce.org/], [xfce4-mixer]) AC_REVISION([$Id$]) AC_PREREQ([2.50]) @@ -76,8 +95,61 @@ dnl *** dnl *** Check for debugging support *** dnl *** -BM_DEBUG_SUPPORT() +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 = xfull -o x$enable_debug = xyes; then + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + 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 = xfull; 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 = xno; then +PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT