diff -Nru banshee-community-extensions-1.9.3/aclocal.m4 banshee-community-extensions-1.9.5/aclocal.m4 --- banshee-community-extensions-1.9.3/aclocal.m4 2011-02-03 21:54:24.000000000 +0000 +++ banshee-community-extensions-1.9.5/aclocal.m4 2011-03-10 17:46:38.000000000 +0000 @@ -9913,6 +9913,7 @@ m4_include([build/m4/extensions/common.m4]) m4_include([build/m4/extensions/coverwallpaper.m4]) m4_include([build/m4/extensions/jamendo.m4]) +m4_include([build/m4/extensions/karaoke.m4]) m4_include([build/m4/extensions/lastfmfingerprint.m4]) m4_include([build/m4/extensions/lcd.m4]) m4_include([build/m4/extensions/lirc.m4]) diff -Nru banshee-community-extensions-1.9.3/AUTHORS banshee-community-extensions-1.9.5/AUTHORS --- banshee-community-extensions-1.9.3/AUTHORS 2010-12-16 15:50:37.000000000 +0000 +++ banshee-community-extensions-1.9.5/AUTHORS 2011-03-08 18:39:52.000000000 +0000 @@ -8,6 +8,7 @@ CoverWallpaper David Corrales Jamendo Bertrand Lorentz Janez Troha + Karaoke Frank Ziegler LastfmFingerprint Olivier Dufour LCD André Gaul Lirc Jean-Baptiste Lab diff -Nru banshee-community-extensions-1.9.3/build/m4/extensions/jamendo.m4 banshee-community-extensions-1.9.5/build/m4/extensions/jamendo.m4 --- banshee-community-extensions-1.9.3/build/m4/extensions/jamendo.m4 2010-11-20 11:15:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/build/m4/extensions/jamendo.m4 2011-02-21 20:29:34.000000000 +0000 @@ -4,7 +4,7 @@ BCE_CHECK_EXTENSION_DEP([Jamendo], [BANSHEE_WEBBROWSER], [banshee-1-webbrowser], - [banshee-1-webbrowser was not found. Please install it or disable the CoverWallpaper extension by passing --disable-jamendo]) + [banshee-1-webbrowser was not found. Please install it or disable the Jamendo extension by passing --disable-jamendo]) if test "x$enable_Jamendo" = "xtry" \ && test "x$have_BANSHEE_WEBBROWSER" = "xyes"; then diff -Nru banshee-community-extensions-1.9.3/build/m4/extensions/karaoke.m4 banshee-community-extensions-1.9.5/build/m4/extensions/karaoke.m4 --- banshee-community-extensions-1.9.3/build/m4/extensions/karaoke.m4 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/build/m4/extensions/karaoke.m4 2011-02-21 21:02:16.000000000 +0000 @@ -0,0 +1,21 @@ +# This must be called after BCE_STREAMRECORDER, because it depends on it +AC_DEFUN([BCE_KARAOKE], +[ + BCE_ARG_DISABLE([Karaoke], [yes]) + + if test "x$enable_Karaoke" = "xyes" \ + && test "x$enable_StreamRecorder" = "xno"; then + AC_MSG_ERROR([The Karaoke extension requires the StreamRecorder extension. Please enable the StreamRecorder extension or disable the Karaoke extensions by passing --disable-karaoke]) + fi + + if test "x$enable_Karaoke" = "xtry"; then + enable_Karaoke=yes + fi + + if test "x$enable_Karaoke" = "xyes"; then + AM_CONDITIONAL(ENABLE_KARAOKE, true) + else + AM_CONDITIONAL(ENABLE_KARAOKE, false) + fi +]) + diff -Nru banshee-community-extensions-1.9.3/build/m4/Makefile.in banshee-community-extensions-1.9.5/build/m4/Makefile.in --- banshee-community-extensions-1.9.3/build/m4/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/build/m4/Makefile.in 2011-03-10 17:46:39.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/build/Makefile.in banshee-community-extensions-1.9.5/build/Makefile.in --- banshee-community-extensions-1.9.3/build/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/build/Makefile.in 2011-03-10 17:46:39.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/configure banshee-community-extensions-1.9.5/configure --- banshee-community-extensions-1.9.3/configure 2011-02-03 21:54:26.000000000 +0000 +++ banshee-community-extensions-1.9.5/configure 2011-03-10 17:46:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for banshee-community-extensions 1.9.3. +# Generated by GNU Autoconf 2.67 for banshee-community-extensions 1.9.5. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='banshee-community-extensions' PACKAGE_TARNAME='banshee-community-extensions' -PACKAGE_VERSION='1.9.3' -PACKAGE_STRING='banshee-community-extensions 1.9.3' +PACKAGE_VERSION='1.9.5' +PACKAGE_STRING='banshee-community-extensions 1.9.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions' PACKAGE_URL='' @@ -769,6 +769,8 @@ MONO_CFLAGS NOTIFY_SHARP_LIBS NOTIFY_SHARP_CFLAGS +ENABLE_KARAOKE_FALSE +ENABLE_KARAOKE_TRUE ENABLE_STREAMRECORDER_FALSE ENABLE_STREAMRECORDER_TRUE ENABLE_RANDOMBYLASTFM_FALSE @@ -1078,6 +1080,7 @@ enable_radiostationfetcher enable_randombylastfm enable_streamrecorder +enable_karaoke enable_telepathy enable_zeitgeistdataprovider with_vendor_build_id @@ -1685,7 +1688,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures banshee-community-extensions 1.9.3 to adapt to many kinds of systems. +\`configure' configures banshee-community-extensions 1.9.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1756,7 +1759,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of banshee-community-extensions 1.9.3:";; + short | recursive ) echo "Configuration of banshee-community-extensions 1.9.5:";; esac cat <<\_ACEOF @@ -1804,6 +1807,7 @@ Do not build the RandomByLastfm extension --disable-streamrecorder Do not build the StreamRecorder extension + --disable-karaoke Do not build the Karaoke extension --disable-telepathy Do not build the Telepathy extension --disable-zeitgeistdataprovider Do not build the ZeitgeistDataprovider extension @@ -1992,7 +1996,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -banshee-community-extensions configure 1.9.3 +banshee-community-extensions configure 1.9.5 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2482,7 +2486,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by banshee-community-extensions $as_me 1.9.3, which was +It was created by banshee-community-extensions $as_me 1.9.5, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3298,7 +3302,7 @@ # Define the identity of the package. PACKAGE='banshee-community-extensions' - VERSION='1.9.3' + VERSION='1.9.5' cat >>confdefs.h <<_ACEOF @@ -5665,13 +5669,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5668: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5672: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5671: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5675: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5674: output\"" >&5) + (eval echo "\"\$as_me:5678: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6876,7 +6880,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6879 "configure"' > conftest.$ac_ext + echo '#line 6883 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8401,11 +8405,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8404: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8408: \$? = $ac_status" >&5 + echo "$as_me:8412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8740,11 +8744,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8747: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8747: \$? = $ac_status" >&5 + echo "$as_me:8751: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8845,11 +8849,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8852: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8852: \$? = $ac_status" >&5 + echo "$as_me:8856: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8900,11 +8904,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8903: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8907: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8907: \$? = $ac_status" >&5 + echo "$as_me:8911: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11284,7 +11288,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11287 "configure" +#line 11291 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11380,7 +11384,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11383 "configure" +#line 11387 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15746,11 +15750,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15749: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15753: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15753: \$? = $ac_status" >&5 + echo "$as_me:15757: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15845,11 +15849,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15852: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15852: \$? = $ac_status" >&5 + echo "$as_me:15856: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15897,11 +15901,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15904: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15904: \$? = $ac_status" >&5 + echo "$as_me:15908: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18794,7 +18798,7 @@ if test "x$enable_Jamendo" = "xyes" -a "x$have_BANSHEE_WEBBROWSER" = "xno"; then - as_fn_error $? "banshee-1-webbrowser was not found. Please install it or disable the CoverWallpaper extension by passing --disable-jamendo" "$LINENO" 5 + as_fn_error $? "banshee-1-webbrowser was not found. Please install it or disable the Jamendo extension by passing --disable-jamendo" "$LINENO" 5 fi @@ -20611,6 +20615,47 @@ + # Check whether --enable-karaoke was given. +if test "${enable_karaoke+set}" = set; then : + enableval=$enable_karaoke; enable_Karaoke=$enableval +else + enable_Karaoke=yes + +fi + + + + if test "x$enable_Karaoke" = "xyes" \ + && test "x$enable_StreamRecorder" = "xno"; then + as_fn_error $? "The Karaoke extension requires the StreamRecorder extension. Please enable the StreamRecorder extension or disable the Karaoke extensions by passing --disable-karaoke" "$LINENO" 5 + fi + + if test "x$enable_Karaoke" = "xtry"; then + enable_Karaoke=yes + fi + + if test "x$enable_Karaoke" = "xyes"; then + if true; then + ENABLE_KARAOKE_TRUE= + ENABLE_KARAOKE_FALSE='#' +else + ENABLE_KARAOKE_TRUE='#' + ENABLE_KARAOKE_FALSE= +fi + + else + if false; then + ENABLE_KARAOKE_TRUE= + ENABLE_KARAOKE_FALSE='#' +else + ENABLE_KARAOKE_TRUE='#' + ENABLE_KARAOKE_FALSE= +fi + + fi + + + # Check whether --enable-telepathy was given. if test "${enable_telepathy+set}" = set; then : enableval=$enable_telepathy; enable_Telepathy=$enableval @@ -21034,7 +21079,7 @@ -ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool help/Makefile po/Makefile.in src/Makefile src/AssemblyInfo.cs src/AlarmClock/Makefile src/Ampache/Makefile src/AppIndicator/Makefile src/Awn/Makefile src/ClutterFlow/Makefile src/ClutterFlow/Banshee.ClutterFlow/Makefile src/ClutterFlow/ClutterFlow/Makefile src/CoverWallpaper/Makefile src/Jamendo/Makefile src/LastfmFingerprint/Makefile src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile src/LastfmFingerprint/liblastfmfpbridge/Makefile src/LCD/Makefile src/Lirc/Makefile src/Lirc/lirc-glue/Makefile src/Lirc/Banshee.Lirc/Makefile src/Lirc/GUITestHarness/Makefile src/Lirc/NUnitTests/Makefile src/LiveRadio/Makefile src/Lyrics/Makefile src/OpenVP/Makefile src/OpenVP/Cdh.Affe/Makefile src/OpenVP/Cdh.Affe.Tests/Makefile src/OpenVP/OpenVP/Makefile src/OpenVP/OpenVP.Core/Makefile src/OpenVP/OpenVP.Scripting/Makefile src/OpenVP/Banshee.OpenVP/Makefile src/OpenVP/Banshee.OpenVP.Visualizations/Makefile src/Magnatune/Makefile src/Mirage/Makefile src/Mirage/libmirageaudio/Makefile src/Mirage/Mirage/Makefile src/Mirage/Banshee.Mirage/Makefile src/Mirage/Test/Makefile src/RadioStationFetcher/Makefile src/RandomByLastfm/Makefile src/StreamRecorder/Makefile src/Telepathy/Makefile src/Telepathy/Banshee.Telepathy/Makefile src/ZeitgeistDataprovider/Makefile" +ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool help/Makefile po/Makefile.in src/Makefile src/Karaoke/Makefile src/AssemblyInfo.cs src/AlarmClock/Makefile src/Ampache/Makefile src/AppIndicator/Makefile src/Awn/Makefile src/ClutterFlow/Makefile src/ClutterFlow/Banshee.ClutterFlow/Makefile src/ClutterFlow/ClutterFlow/Makefile src/CoverWallpaper/Makefile src/Jamendo/Makefile src/LastfmFingerprint/Makefile src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile src/LastfmFingerprint/liblastfmfpbridge/Makefile src/LCD/Makefile src/Lirc/Makefile src/Lirc/lirc-glue/Makefile src/Lirc/Banshee.Lirc/Makefile src/Lirc/GUITestHarness/Makefile src/Lirc/NUnitTests/Makefile src/LiveRadio/Makefile src/Lyrics/Makefile src/OpenVP/Makefile src/OpenVP/Cdh.Affe/Makefile src/OpenVP/Cdh.Affe.Tests/Makefile src/OpenVP/OpenVP/Makefile src/OpenVP/OpenVP.Core/Makefile src/OpenVP/OpenVP.Scripting/Makefile src/OpenVP/Banshee.OpenVP/Makefile src/OpenVP/Banshee.OpenVP.Visualizations/Makefile src/Magnatune/Makefile src/Mirage/Makefile src/Mirage/libmirageaudio/Makefile src/Mirage/Mirage/Makefile src/Mirage/Banshee.Mirage/Makefile src/Mirage/Test/Makefile src/RadioStationFetcher/Makefile src/RandomByLastfm/Makefile src/StreamRecorder/Makefile src/Telepathy/Makefile src/Telepathy/Banshee.Telepathy/Makefile src/ZeitgeistDataprovider/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -21362,6 +21407,14 @@ as_fn_error $? "conditional \"ENABLE_STREAMRECORDER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_KARAOKE_TRUE}" && test -z "${ENABLE_KARAOKE_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_KARAOKE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_KARAOKE_TRUE}" && test -z "${ENABLE_KARAOKE_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_KARAOKE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_TELEPATHY_TRUE}" && test -z "${ENABLE_TELEPATHY_FALSE}"; then as_fn_error $? "conditional \"ENABLE_TELEPATHY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21786,7 +21839,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by banshee-community-extensions $as_me 1.9.3, which was +This file was extended by banshee-community-extensions $as_me 1.9.5, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21852,7 +21905,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -banshee-community-extensions config.status 1.9.3 +banshee-community-extensions config.status 1.9.5 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -22345,6 +22398,7 @@ "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/Karaoke/Makefile") CONFIG_FILES="$CONFIG_FILES src/Karaoke/Makefile" ;; "src/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES src/AssemblyInfo.cs" ;; "src/AlarmClock/Makefile") CONFIG_FILES="$CONFIG_FILES src/AlarmClock/Makefile" ;; "src/Ampache/Makefile") CONFIG_FILES="$CONFIG_FILES src/Ampache/Makefile" ;; @@ -23966,6 +24020,7 @@ ClutterFlow: ${enable_ClutterFlow} CoverWallpaper: ${enable_CoverWallpaper} Jamendo: ${enable_Jamendo} + Karaoke: ${enable_Karaoke} LastfmFingerprint: ${enable_LastfmFingerprint} LCD: ${enable_LCD} Lirc: ${enable_Lirc} diff -Nru banshee-community-extensions-1.9.3/configure.ac banshee-community-extensions-1.9.5/configure.ac --- banshee-community-extensions-1.9.3/configure.ac 2011-02-03 21:54:09.000000000 +0000 +++ banshee-community-extensions-1.9.5/configure.ac 2011-03-10 17:42:17.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.52) -AC_INIT([banshee-community-extensions], 1.9.3, +AC_INIT([banshee-community-extensions], 1.9.5, [http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions]) AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign]) @@ -95,6 +95,7 @@ BCE_RADIOSTATIONFETCHER BCE_RANDOMBYLASTFM BCE_STREAMRECORDER +BCE_KARAOKE BCE_TELEPATHY BCE_ZEITGEISTDP @@ -131,6 +132,7 @@ po/Makefile.in src/Makefile +src/Karaoke/Makefile src/AssemblyInfo.cs src/AlarmClock/Makefile @@ -203,6 +205,7 @@ ClutterFlow: ${enable_ClutterFlow} CoverWallpaper: ${enable_CoverWallpaper} Jamendo: ${enable_Jamendo} + Karaoke: ${enable_Karaoke} LastfmFingerprint: ${enable_LastfmFingerprint} LCD: ${enable_LCD} Lirc: ${enable_Lirc} diff -Nru banshee-community-extensions-1.9.3/debian/banshee-extension-karaoke.install banshee-community-extensions-1.9.5/debian/banshee-extension-karaoke.install --- banshee-community-extensions-1.9.3/debian/banshee-extension-karaoke.install 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/banshee-extension-karaoke.install 2011-03-12 16:42:19.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/banshee-1/Extensions/Banshee.Karaoke.* diff -Nru banshee-community-extensions-1.9.3/debian/changelog banshee-community-extensions-1.9.5/debian/changelog --- banshee-community-extensions-1.9.3/debian/changelog 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/changelog 2011-03-12 16:42:19.000000000 +0000 @@ -1,3 +1,54 @@ +banshee-community-extensions (1.9.5-1ubuntu1~hyper1+karmic) karmic; urgency=low + + * Merge from Lucid, remaining changes: + + Use -cil packages for build-dep instead of -cil-dev + + Use csc instead of mono-csc + + Disable appindicator and clutterflow + + -- Chow Loong Jin Sun, 13 Mar 2011 00:42:15 +0800 + +banshee-community-extensions (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low + + * Backport to lucid + + -- Chow Loong Jin Fri, 11 Mar 2011 22:39:23 +0800 + +banshee-community-extensions (1.9.5-1ubuntu1~hyper1+maverick) maverick; urgency=low + + * Backport to maverick + + -- Chow Loong Jin Fri, 11 Mar 2011 22:37:53 +0800 + +banshee-community-extensions (1.9.5-1ubuntu1~hyper1+natty) natty; urgency=low + + * Backport to natty + + -- Chow Loong Jin Fri, 11 Mar 2011 22:36:28 +0800 + +banshee-community-extensions (1.9.5-1ubuntu1) natty; urgency=low + + * Merge from Debian Unstable, remaining changes: + + Enable LIRC and AppIndicator extensions + + -- Chow Loong Jin Fri, 11 Mar 2011 22:21:22 +0800 + +banshee-community-extensions (1.9.5-1) UNRELEASED; urgency=low + + * [aea54e9] New upstream release: + + Enhancements: + - Karaoke: added a new extension to filter out the singers voice + + Bugs Fixed: + - LastfmFingerprint: Fix some exceptions + - Fix missing unique IDs in several extension sources + - Lirc: Fix potential memory issues + - Lyrics: Fix NullPointerException when artist is unknown + * [27bfc37] Update debian/copyright + * [2ee2a15] Fix spelling errors in description of lastfm + * [3a7a674] Add banshee-extension-karaoke + * [edcfa51] Drop upstreamed lirc memleak and ampache unicode patches + + -- Chow Loong Jin Fri, 11 Mar 2011 21:50:31 +0800 + banshee-community-extensions (1.9.3-1ubuntu1~hyper1+karmic) karmic; urgency=low * Merge from Lucid, remaining changes: @@ -25,14 +76,14 @@ -- Chow Loong Jin Sun, 20 Feb 2011 14:45:40 +0800 -banshee-community-extensions (1.9.3-1ubuntu1) UNRELEASED; urgency=low +banshee-community-extensions (1.9.3-1ubuntu1) natty; urgency=low * [a5570d7] Merge from Debian Experimental, remaining changes: + Enable LIRC and AppIndicator extensions - -- Chow Loong Jin Sat, 05 Feb 2011 02:19:47 +0800 + -- Chow Loong Jin Tue, 01 Mar 2011 01:54:03 +0800 -banshee-community-extensions (1.9.3-1) UNRELEASED; urgency=low +banshee-community-extensions (1.9.3-1) unstable; urgency=low * [2d6dcff] New upstream release: + Enhancements: @@ -46,6 +97,7 @@ - LiveRadio: Fix display of the source icon - Lyrics: Don't use lyricsplugin.com anymore (bgo#640570) - Magnatune: Fix display of the source icon + - Fail to build against Banshee 1.9.3 (Closes: 614539) * [8c2d573] Use correct unicode escape in fix-ampache-unicode.patch * [cb02092] Patch to fix compiler warning and some memory issues in Lirc diff -Nru banshee-community-extensions-1.9.3/debian/control banshee-community-extensions-1.9.5/debian/control --- banshee-community-extensions-1.9.3/debian/control 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/control 2011-03-12 16:42:19.000000000 +0000 @@ -136,6 +136,17 @@ . Banshee is a media management and playback application for the GNOME desktop. +Package: banshee-extension-karaoke +Enhances: banshee +Architecture: all +Depends: banshee-extension-streamrecorder (= ${source:Version}), + ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Karaoke extension for Banshee + This package adds karaoke functionality to Banshee by allowing filtering the + singers' voice out of the song as it is played. + . + Banshee is a media management and playback application for the GNOME desktop. + Package: banshee-extension-lastfmfingerprint Enhances: banshee Architecture: any @@ -146,7 +157,7 @@ allowing Banshee to automatically generate and audio fingerprint and correct your metadata by querying Last.FM for the correct metadata. . - Banshee is a media maangement and playback application for the GNOME dekstop. + Banshee is a media management and playback application for the GNOME desktop. Package: banshee-extension-lcd Enhances: banshee diff -Nru banshee-community-extensions-1.9.3/debian/copyright banshee-community-extensions-1.9.5/debian/copyright --- banshee-community-extensions-1.9.3/debian/copyright 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/copyright 2011-03-12 16:42:19.000000000 +0000 @@ -43,6 +43,9 @@ Files: src/CoverWallpaper/* Copyright: 2009, David Corrales +Files: src/Karaoke/* +Copyright: 2011, Frank Ziegler + Files: src/LastfmFingerprint/* src/LastfmFingerprint/liblastfmbridge/gst-* src/LastfmFingerprint/liblastfmbridge/lastfmbridgetest.cpp @@ -70,7 +73,7 @@ Files: src/LiveRadio/* Copyright: 2008, Novel, Inc. - 2010, Frank Ziegler + 2010, Frank Ziegler Files: src/Lyrics/* Copyright: 2009, Christian Martellini @@ -115,7 +118,7 @@ Files: src/StreamRecorder/* Copyright: 2009, Akseli Mantila - 2009, Frank Ziegler + 2009, Frank Ziegler Files: src/Telepathy/* Copyright: 2009, Neil Loknath diff -Nru banshee-community-extensions-1.9.3/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch banshee-community-extensions-1.9.5/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch --- banshee-community-extensions-1.9.3/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From 2854587dc3635d2fd2c17b42e1c007506f946502 Mon Sep 17 00:00:00 2001 -From: Chow Loong Jin -Date: Sun, 20 Feb 2011 16:33:08 +0800 -Subject: [PATCH] [Lirc] Fix warning and potential memory issues - -Fix the following issues:- - * Warning about control reaching the end of - lirc_glue_next_valid_command which has a non-void return value. - * Leakage of lirc code in the same function if it yielded a NULL - command from lirc_code2char - * Remove a free(command) that would only fire if command == NULL ---- - src/Lirc/lirc-glue/lirc-glue.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/Lirc/lirc-glue/lirc-glue.c b/src/Lirc/lirc-glue/lirc-glue.c -index bdb7ef7..793836c 100644 ---- a/src/Lirc/lirc-glue/lirc-glue.c -+++ b/src/Lirc/lirc-glue/lirc-glue.c -@@ -46,14 +46,15 @@ char *lirc_glue_next_valid_command () - } else { - lirc_glue_set_error (1); // means we don't have a code. totally normal for other unrelated button presses - } -+ -+ free (code); -+ - if (lirc_glue_get_error () < 1 ) { -- free (code); -- if (command != NULL) -- return (command); -- free (command); -- return (NULL); -+ return (command); - } - } -+ -+ return (NULL); // daemon shut down so no next code - } - - struct lirc_config *lirc_glue_getconfig () --- -1.7.1 - diff -Nru banshee-community-extensions-1.9.3/debian/patches/fix-ampache-unicode.patch banshee-community-extensions-1.9.5/debian/patches/fix-ampache-unicode.patch --- banshee-community-extensions-1.9.3/debian/patches/fix-ampache-unicode.patch 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/patches/fix-ampache-unicode.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Index: banshee-community-extensions.git/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs -=================================================================== ---- banshee-community-extensions.git.orig/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs 2010-12-23 16:01:22.000000000 +0000 -+++ banshee-community-extensions.git/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs 2010-12-23 16:54:08.162029643 +0000 -@@ -47,7 +47,7 @@ - this.entPassword.Name = "entPassword"; - this.entPassword.IsEditable = true; - this.entPassword.Visibility = false; -- this.entPassword.InvisibleChar = '•'; -+ this.entPassword.InvisibleChar = '\u2022'; - this.table1.Add (this.entPassword); - global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1[this.entPassword])); - w1.TopAttach = ((uint)(2)); -@@ -60,7 +60,7 @@ - this.entUrl.CanFocus = true; - this.entUrl.Name = "entUrl"; - this.entUrl.IsEditable = true; -- this.entUrl.InvisibleChar = '•'; -+ this.entUrl.InvisibleChar = '\u2022'; - this.table1.Add (this.entUrl); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.entUrl])); - w2.LeftAttach = ((uint)(1)); -@@ -71,7 +71,7 @@ - this.entUser.CanFocus = true; - this.entUser.Name = "entUser"; - this.entUser.IsEditable = true; -- this.entUser.InvisibleChar = '•'; -+ this.entUser.InvisibleChar = '\u2022'; - this.table1.Add (this.entUser); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entUser])); - w3.TopAttach = ((uint)(1)); diff -Nru banshee-community-extensions-1.9.3/debian/patches/series banshee-community-extensions-1.9.5/debian/patches/series --- banshee-community-extensions-1.9.3/debian/patches/series 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/patches/series 2011-03-12 16:42:19.000000000 +0000 @@ -1,3 +1 @@ -fix-ampache-unicode.patch -0001-Lirc-Fix-warning-and-potential-memory-issues.patch fsck-intltool.patch diff -Nru banshee-community-extensions-1.9.3/debian/rules banshee-community-extensions-1.9.5/debian/rules --- banshee-community-extensions-1.9.3/debian/rules 2011-02-20 08:51:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/debian/rules 2011-03-12 16:42:19.000000000 +0000 @@ -18,6 +18,7 @@ --disable-clutterflow \ --enable-coverwallpaper \ --enable-jamendo \ + --enable-karaoke \ --enable-lastfmfingerprint \ --enable-lcd \ --enable-lirc \ diff -Nru banshee-community-extensions-1.9.3/help/Makefile.in banshee-community-extensions-1.9.5/help/Makefile.in --- banshee-community-extensions-1.9.3/help/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/help/Makefile.in 2011-03-10 17:46:39.000000000 +0000 @@ -70,6 +70,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/Makefile.in banshee-community-extensions-1.9.5/Makefile.in --- banshee-community-extensions-1.9.3/Makefile.in 2011-02-03 21:54:31.000000000 +0000 +++ banshee-community-extensions-1.9.5/Makefile.in 2011-03-10 17:46:43.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/NEWS banshee-community-extensions-1.9.5/NEWS --- banshee-community-extensions-1.9.3/NEWS 2011-02-03 21:53:18.000000000 +0000 +++ banshee-community-extensions-1.9.5/NEWS 2011-03-10 17:42:17.000000000 +0000 @@ -1,4 +1,30 @@ ================================= +Version 1.9.5 - March 10, 2011 +================================= + +Contributors: +Frank Ziegler + +Bugs Fixed: +* Karaoke: fixed a potential application crash + +================================= +Version 1.9.4 - March 3, 2011 +================================= + +Contributors: +Bertrand Lorentz, Frank Ziegler, Olivier Dufour, Chow Loong Jin + +Enhancements: +* Karaoke: added a new extension to filter out the singers voice + +Bugs Fixed: +* LastfmFingerprint: Fix some exceptions +* Fix missing unique IDs in several extension sources +* Lirc: Fix potential memory issues +* Lyrics: Fix NullPointerException when artist is unknown + +================================= Version 1.9.3 - February 3, 2011 ================================= diff -Nru banshee-community-extensions-1.9.3/po/de.po banshee-community-extensions-1.9.5/po/de.po --- banshee-community-extensions-1.9.3/po/de.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/de.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2011-01-06 19:23+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: fixx \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "Wecker" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "Einschlaf-Funktion" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "Setze die Einschlafzeit" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "Wecker" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "Setze die Weckzeit" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "_Konfigurieren" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "Konfiguriere das Wecker Plugin" @@ -94,17 +94,17 @@ msgid "Command To Execute:" msgstr "Auszuführender Befehl:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "Einschlaf-Funktion" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "Einschlaf-Funktion:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" -msgstr "(setze auf 0:00 zum Abstellen)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" +msgstr "Starte Timer" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 msgid "Connect" @@ -129,6 +129,7 @@ msgstr "Titel" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" msgstr "Passwort:" @@ -325,22 +326,118 @@ msgid "Search Jamendo" msgstr "Suche auf Jamendo" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" +msgstr "Karaoke Konfiguration" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "Du kannst die Parameter für den Karaokeeffekt hier ändern und eigene Werte für Filterband, Filterbreite und Effektlevel setzen." + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "Effektlevel:" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "Filterband:" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "Filterbreite:" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "Der Effektlevel definiert den Grad um den die Stimmfrequenzen reduziert werden." + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "Das Filterband definiert die Position des Filters im Frequenzspektrum." + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "Die Filterbreite definiert wie breit das Spektrum der gefilterten Frequenzen ist." + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "_Originalwerte einstellen" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "_Abbrechen" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "_Speichern" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "_Karaoke" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "_Konfigurieren" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "Konfiguriere die Karaoke Erweiterung" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "_Aktiviere Karaoke Modus" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" +msgstr "Aktiviere Karaoke Modus" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 msgid "Get Information From Track Fingerprint" msgstr "Hole Informationen über die Track-Signatur" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" msgstr "Hole Track Informationen über die akustische last.fm Signatur" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" msgstr "Erstelle akustische Signatur" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." msgstr "Scanning..." +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "Bei Last.fm einloggen" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "Last.fm Konto Login" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "Bitte gib deine Last.fm Kontodaten ein." + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "Einloggen" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "Benutzername:" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "Bei Last.fm registrieren" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "Für Last.fm authorisieren" + #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" msgstr "LCD Konfiguration" @@ -399,11 +496,11 @@ msgid "Choose By Query" msgstr "Freitextsuche" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "Ja" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "Nein" @@ -466,19 +563,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "Genre klicken zum (Neu)Laden der Liste oder Freitextsuche eingeben. Refresh zum Neuladen der Genreliste. " -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "LiveRadio Plugin" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "Sendername" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "Urheber" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "Beschreibung" @@ -569,11 +666,6 @@ msgid "Live_Radio" msgstr "Live_Radio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "_Konfigurieren" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "Konfiguriere das LiveRadio plugin" @@ -913,14 +1005,6 @@ msgid "_Browse" msgstr "_Durchsuchen" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "_Abbrechen" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "_Speichern" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" msgstr "Importiere Dateien in die Medienbibliothek" diff -Nru banshee-community-extensions-1.9.3/po/es.po banshee-community-extensions-1.9.5/po/es.po --- banshee-community-extensions-1.9.3/po/es.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/es.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2011-01-06 19:23+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: nemecis1000 \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "Despertador" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "Temporizador..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "Establecer el valor del temporizador" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "Alarma ..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "Establezca la hora de la alarma" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "_Configurar..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "Configurar el complemento Despertador" @@ -94,17 +94,17 @@ msgid "Command To Execute:" msgstr "Comando a ejecutar:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "Temporizador" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "Temporizador :" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" -msgstr "(0:00 para desactivar)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" +msgstr "" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 msgid "Connect" @@ -129,6 +129,7 @@ msgstr "Título" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" msgstr "Contraseña:" @@ -325,22 +326,118 @@ msgid "Search Jamendo" msgstr "Buscar en Jamendo" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "_Guardar" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "_Configurar" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 msgid "Get Information From Track Fingerprint" msgstr "Obtener información desde la huella digital de la pista" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" msgstr "Obtener la información de la pista desde la huella digital de last.fm" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" msgstr "Obteniendo huella digital de sonido" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." msgstr "Escaneando..." +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "" + #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" msgstr "Configuración LCD" @@ -399,11 +496,11 @@ msgid "Choose By Query" msgstr "Escoger por Consulta" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "Sí" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "No" @@ -466,19 +563,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "Haga clic en un género para cargar/actualizar las entradas o ingrese una consulta. Utilice el botón actualizar para actualizar los géneros." -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "LiveRadioPlugin" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "Estación" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "Creador" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "Descripción" @@ -569,11 +666,6 @@ msgid "Live_Radio" msgstr "Live_Radio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "_Configurar" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "Configurar el complemento LiveRadio" @@ -909,14 +1001,6 @@ msgid "_Browse" msgstr "_Navegador" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "_Cancelar" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "_Guardar" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" msgstr "Importar archivos a la colección de los medios de comunicación" diff -Nru banshee-community-extensions-1.9.3/po/fi.po banshee-community-extensions-1.9.5/po/fi.po --- banshee-community-extensions-1.9.3/po/fi.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/fi.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2010-12-17 15:00+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: bl8 \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "" @@ -94,16 +94,16 @@ msgid "Command To Execute:" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" msgstr "" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 @@ -129,6 +129,7 @@ msgstr "" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" msgstr "" @@ -325,22 +326,118 @@ msgid "Search Jamendo" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 -msgid "Get Information From Track Fingerprint" +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "_Peruuta" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "_Tallenna" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "_Asetukset" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" msgstr "" #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +msgid "Get Information From Track Fingerprint" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." msgstr "" +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "" + #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" msgstr "" @@ -397,11 +494,11 @@ msgid "Choose By Query" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "" @@ -464,19 +561,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "" @@ -567,11 +664,6 @@ msgid "Live_Radio" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "_Asetukset" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "" @@ -905,14 +997,6 @@ msgid "_Browse" msgstr "_Selaa" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "_Peruuta" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "_Tallenna" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" msgstr "Tuo tiedostot musiikkikirjastoon" diff -Nru banshee-community-extensions-1.9.3/po/fr.po banshee-community-extensions-1.9.5/po/fr.po --- banshee-community-extensions-1.9.3/po/fr.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/fr.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2011-01-06 19:23+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: G37 \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "Réveil" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "Mise en veille" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "Délai de mise en veille" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "Réveil..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "Régler le réveil" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "_Configurer..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "Configurer l'extension Réveil" @@ -94,17 +94,17 @@ msgid "Command To Execute:" msgstr "Commande à exécuter:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "Mise en Veille" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "Mise en Veille:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" -msgstr "(Mettre à 0:00 pour désactiver)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" +msgstr "" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 msgid "Connect" @@ -129,6 +129,7 @@ msgstr "Titre" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" msgstr "Mot de passe:" @@ -325,22 +326,118 @@ msgid "Search Jamendo" msgstr "Rechercher sur Jamendo" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "_Annuler" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "_Enregistrer" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "_Configurer" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 msgid "Get Information From Track Fingerprint" msgstr "Obtenir les informations à partir de l'empreinte digitale" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" msgstr "Obtenir les informations de la pistes à partir l'empreinte acoustique Last.fm" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" msgstr "Récupération de l'empreinte digitale accoustique" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." msgstr "Analyse..." +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "" + #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" msgstr "configuration LCD" @@ -397,11 +494,11 @@ msgid "Choose By Query" msgstr "Choisissez par Query" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "Oui" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "Non" @@ -464,19 +561,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "Sélectionner un genre pour rafraîchir les entrées / ou tapez une requête. Utilisez le bouton Actualiser pour actualiser genres." -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "Extension LiveRadio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "Station" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "Créateur" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "Description" @@ -567,11 +664,6 @@ msgid "Live_Radio" msgstr "Live_Radio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "_Configurer" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "Configurer l'extension LiveRadio" @@ -899,14 +991,6 @@ msgid "_Browse" msgstr "_Parcourir" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "_Annuler" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "_Enregistrer" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" msgstr "Importez des fichiers dans la bibliothèque de médias" diff -Nru banshee-community-extensions-1.9.3/po/it.po banshee-community-extensions-1.9.5/po/it.po --- banshee-community-extensions-1.9.3/po/it.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/it.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2011-01-06 19:23+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: Janvitus \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "Sveglia" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "Spegnimento..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "Imposta l'orario dello spegnimento" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "Sveglia..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "Imposta l'orario della sveglia" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "_Configura..." -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "Configura il plugin della sveglia" @@ -94,55 +94,56 @@ msgid "Command To Execute:" msgstr "Comando da eseguire:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "Spegnimento" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "Spegnimento:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" -msgstr "(per disabilitare impostare a 0:00)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" +msgstr "Avvia sveglia" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 msgid "Connect" -msgstr "" +msgstr "Connetti" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:87 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:94 msgid "Artist" -msgstr "" +msgstr "Artista" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:89 #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:95 msgid "Album" -msgstr "" +msgstr "Album" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:91 msgid "Playlist" -msgstr "" +msgstr "Scaletta" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:93 msgid "Title" -msgstr "" +msgstr "Titolo" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" -msgstr "" +msgstr "Password:" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:99 msgid "Ampache Server Name:" -msgstr "" +msgstr "Nome server Ampache:" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:110 msgid "User Name:" -msgstr "" +msgstr "Nome utente:" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:131 msgid "Save" -msgstr "" +msgstr "Salva" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:142 msgid "Clear" @@ -213,7 +214,7 @@ #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:57 msgid "Enable threaded loading of artwork" -msgstr "Abilita il caricamento dell'elenco delle copertine" +msgstr "Abilitare il caricamento dell'elenco delle copertine" #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:58 msgid "If enabled ClutterFlow will use threading to load it's artwork" @@ -229,7 +230,7 @@ #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:85 msgid "Immediately apply playback mode changes" -msgstr "Immediatamente applica le modifiche alla modalità di riproduzione" +msgstr "Applicare immediatamente le modifiche alla modalità di riproduzione" #: ../src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowSchemas.cs:86 msgid "Starts playing a new song immediately after the playback mode changed (Party Mode or Album Mode)" @@ -310,36 +311,132 @@ #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:63 msgid "Jamendo Downloads" -msgstr "" +msgstr "Scaricamenti Jamendo" #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:64 msgid "Contacting..." -msgstr "" +msgstr "Contatto..." #: ../src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs:95 msgid "Importing..." -msgstr "" +msgstr "Importazione..." #: ../src/Jamendo/Banshee.Jamendo/JamendoWebBrowserShell.cs:41 #, csharp-format msgid "Search Jamendo" +msgstr "Cerca in Jamendo" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 -msgid "Get Information From Track Fingerprint" +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "_Annulla" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "_Salva" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "_Configura" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" msgstr "" #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +msgid "Get Information From Track Fingerprint" +msgstr "Recupera informazioni impronta della traccia" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" -msgstr "" +msgstr "Recupera le informazioni dall'impronta acustica da Last.fm" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" -msgstr "" +msgstr "Recupero impronta sonora" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." -msgstr "" +msgstr "Scansione..." + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "Accedi a Last.fm" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "Account di accesso a Last.fm" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "Immettere le credenziali dell'account di Last.fm." + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "Accedi" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "Nome utente:" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "Registrati per Last.fm" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "Autorizza per Last.fm" #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" @@ -380,7 +477,7 @@ #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioConfigDialog.cs:91 msgid "Enable this plugin" -msgstr "Abilita questo plugin" +msgstr "Abilitare questo plugin" #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioFilterView.cs:87 msgid "Choose By Genre" @@ -399,11 +496,11 @@ msgid "Choose By Query" msgstr "Scegli per ricerca" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "Sì" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "No" @@ -466,19 +563,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "Fare clic su un genere per caricare/aggiornare le voci o digitare una ricerca. Usare il pulsante per aggiornare i generi." -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "Plugin LiveRadio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "Stazione" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "Creatore" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "Descrizione" @@ -569,11 +666,6 @@ msgid "Live_Radio" msgstr "Live_Radio" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "_Configura" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "Configura il plugin LiveRadio" @@ -781,12 +873,12 @@ "{0}Radiostation fetcher{1}\n" "({2})" msgstr "" -"{0}Recupero Radiostation{1}\n" +"{0}Recupero stazioni radio{1}\n" "({2})" #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:114 msgid "Choose a genre or enter a text that you wish to be queried, then press the Get stations button. Found stations will be added to internet-radio source." -msgstr "Scegliere un genere o immettere un testo che si desidera cercare, quindi premere il pulsare Recupera stazioni. Le stazioni trovate saranno aggiunte alla fonte radio Internet." +msgstr "Scegliere un genere o immettere un testo che si desidera cercare, quindi premere il pulsare «Recupera stazioni». Le stazioni trovate saranno aggiunte alla fonte radio Internet." #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:127 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:128 @@ -816,19 +908,19 @@ #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:233 #, csharp-format msgid "ERROR: Internet-radio extension not available." -msgstr "ERRORE: estensione Radio Internet non disponibile." +msgstr "Errore: estensione Radio Internet non disponibile." #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:215 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:236 #, csharp-format msgid "ERROR: Network error." -msgstr "ERRORE: errore di rete." +msgstr "Errore: errore di rete." #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:218 #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:239 #, csharp-format msgid "ERROR" -msgstr "ERRORE" +msgstr "Errore" #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/FetcherDialog.cs:224 #, csharp-format @@ -837,7 +929,7 @@ #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:69 msgid "_Radiostation fetcher" -msgstr "Recupero _Radiostation" +msgstr "Recupera stazioni _radio" #: ../src/RadioStationFetcher/Banshee.RadioStationFetcher/RadioStationFetcherService.cs:72 msgid "_Shoutcast" @@ -862,27 +954,27 @@ #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:66 msgid "Shuffle by similar Artists (via Lastfm)" -msgstr "" +msgstr "Mischia per artisti simili (via Last.fm)" #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:67 msgid "by similar artists" -msgstr "" +msgstr "per artisti simili" #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmSimilarArtists.cs:68 msgid "Play songs similar to those already played (via Lastfm)" -msgstr "" +msgstr "Riproduce brani simili a quelli già riprodotti (via Last.fm)" #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:60 msgid "Shuffle by your Top Artists (via Lastfm)" -msgstr "" +msgstr "Mischia per artisti preferiti (via Last.fm)" #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:61 msgid "by your top artists" -msgstr "" +msgstr "per artisti preferiti" #: ../src/RandomByLastfm/Banshee.RandomByLastfm/RandomByLastfmUserTopArtists.cs:62 msgid "Play songs from your Top Artists (via Lastfm)" -msgstr "" +msgstr "Riproduce brani dai propri artisti preferiti (via Last.fm)" #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:88 #, csharp-format @@ -913,17 +1005,9 @@ msgid "_Browse" msgstr "_Esplora" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "_Annulla" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "_Salva" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" -msgstr "Importa file nella collezione multimediale" +msgstr "Importare file nella collezione multimediale" #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:108 msgid "Enable automatic files splitting by Metadata" diff -Nru banshee-community-extensions-1.9.3/po/POTFILES.in banshee-community-extensions-1.9.5/po/POTFILES.in --- banshee-community-extensions-1.9.3/po/POTFILES.in 2011-01-16 19:40:09.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/POTFILES.in 2011-02-21 20:07:25.000000000 +0000 @@ -14,6 +14,8 @@ src/ClutterFlow/Banshee.ClutterFlow/ClutterFlowService.cs src/Jamendo/Banshee.Jamendo/JamendoDownloadManager.cs src/Jamendo/Banshee.Jamendo/JamendoWebBrowserShell.cs +src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs +src/Karaoke/Banshee.Karaoke/KaraokeService.cs src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs diff -Nru banshee-community-extensions-1.9.3/po/ru_RU.po banshee-community-extensions-1.9.5/po/ru_RU.po --- banshee-community-extensions-1.9.3/po/ru_RU.po 2011-02-03 22:11:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/po/ru_RU.po 2011-03-08 18:39:52.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the banshee-community-extensions package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: Banshee Community Extensions\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions\n" -"POT-Creation-Date: 2010-12-17 12:02+0100\n" -"PO-Revision-Date: 2011-01-06 19:26+0000\n" +"POT-Creation-Date: 2011-02-21 23:35+0100\n" +"PO-Revision-Date: 2011-02-22 11:04+0000\n" "Last-Translator: hammer \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -17,32 +17,32 @@ "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:70 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:69 msgid "Alarm Clock" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:73 msgid "Sleep Timer..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:75 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:74 msgid "Set the sleep timer value" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:77 msgid "Alarm..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:79 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:78 msgid "Set the alarm time" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:81 #: ../src/LCD/Banshee.LCD/LCDService.cs:70 msgid "_Configure..." msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:83 +#: ../src/AlarmClock/Banshee.AlarmClock/AlarmClockService.cs:82 msgid "Configure the Alarm Clock plugin" msgstr "" @@ -94,16 +94,16 @@ msgid "Command To Execute:" msgstr "Команда для запуска:" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:45 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:46 msgid "Sleep Timer" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:67 +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:72 msgid "Sleep Timer :" msgstr "" -#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:69 -msgid "(set to 0:00 to disable)" +#: ../src/AlarmClock/Banshee.AlarmClock/SleepTimerConfigDialog.cs:83 +msgid "Start Timer" msgstr "" #: ../src/Ampache/Banshee.Ampache/Gui/AmpacheView.cs:75 @@ -129,6 +129,7 @@ msgstr "Название" #: ../src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs:86 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:62 msgid "Password:" msgstr "Пароль:" @@ -325,22 +326,118 @@ msgid "Search Jamendo" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:75 -msgid "Get Information From Track Fingerprint" +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:77 +msgid "Karaoke configuration" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:81 +msgid "You can alter the parameters of the karaoke effect here and define custom filter-band, filter-width and effect level." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:87 +msgid "Effect Level:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:88 +msgid "Filter Band:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:89 +msgid "Filter Width:" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:94 +msgid "The effect level defines to what degree the voice frequencies are reduced." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:101 +msgid "The filter band defines position of filter within the frequency spectrum." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:108 +msgid "The filter width defines how wide the spectrum of the filtered frequencies is." +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:114 +msgid "Restore _defaults" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:117 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 +msgid "_Cancel" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs:119 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 +msgid "_Save" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:86 +msgid "_Karaoke" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:88 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 +#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 +msgid "_Configure" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:89 +msgid "Configure the Karaoke extension" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:100 +msgid "_Activate Karaoke mode" +msgstr "" + +#: ../src/Karaoke/Banshee.Karaoke/KaraokeService.cs:101 +msgid "Activate Karaoke mode" msgstr "" #: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:76 +msgid "Get Information From Track Fingerprint" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:77 msgid "Get track information from last.fm acoustic fingerprint" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:105 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:106 msgid "Getting sound fingerprint" msgstr "" -#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:108 +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs:109 msgid "Scanning..." msgstr "" +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:69 +msgid "Last.fm Account Login" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:71 +msgid "Please enter your Last.fm account credentials." +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs:92 +msgid "Log In" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:57 +msgid "Username:" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:101 +msgid "Sign up for Last.fm" +msgstr "" + +#: ../src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs:113 +msgid "Authorize for Last.fm" +msgstr "" + #: ../src/LCD/Banshee.LCD/ConfigurationDialog.cs:46 msgid "LCD configuration" msgstr "" @@ -397,11 +494,11 @@ msgid "Choose By Query" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "Yes" msgstr "Да" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:558 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPlugins/LiveRadioBasePlugin.cs:583 msgid "No" msgstr "Нет" @@ -464,19 +561,19 @@ msgid "Click a genre to load/refresh entries or type a query. Use the refresh button to refresh genres." msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:68 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:69 msgid "LiveRadioPlugin" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:119 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 msgid "Station" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:120 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:122 msgid "Creator" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:121 +#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSource.cs:123 msgid "Description" msgstr "" @@ -567,11 +664,6 @@ msgid "Live_Radio" msgstr "" -#: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:107 -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderService.cs:114 -msgid "_Configure" -msgstr "" - #: ../src/LiveRadio/Banshee.LiveRadio/LiveRadioSource.cs:108 msgid "Configure the LiveRadio plugin" msgstr "" @@ -899,14 +991,6 @@ msgid "_Browse" msgstr "" -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:102 -msgid "_Cancel" -msgstr "" - -#: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:104 -msgid "_Save" -msgstr "" - #: ../src/StreamRecorder/Banshee.Streamrecorder/StreamrecorderConfigDialog.cs:106 msgid "Import files to media library" msgstr "" diff -Nru banshee-community-extensions-1.9.3/src/AlarmClock/Makefile.in banshee-community-extensions-1.9.5/src/AlarmClock/Makefile.in --- banshee-community-extensions-1.9.3/src/AlarmClock/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/AlarmClock/Makefile.in 2011-03-10 17:46:39.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs banshee-community-extensions-1.9.5/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs --- banshee-community-extensions-1.9.3/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs 2011-01-12 21:00:18.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs 2011-02-21 20:07:25.000000000 +0000 @@ -47,7 +47,7 @@ this.entPassword.Name = "entPassword"; this.entPassword.IsEditable = true; this.entPassword.Visibility = false; - this.entPassword.InvisibleChar = '•'; + this.entPassword.InvisibleChar = '\u2022'; this.table1.Add (this.entPassword); global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1[this.entPassword])); w1.TopAttach = ((uint)(2)); @@ -60,7 +60,7 @@ this.entUrl.CanFocus = true; this.entUrl.Name = "entUrl"; this.entUrl.IsEditable = true; - this.entUrl.InvisibleChar = '•'; + this.entUrl.InvisibleChar = '\u2022'; this.table1.Add (this.entUrl); global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.entUrl])); w2.LeftAttach = ((uint)(1)); @@ -71,7 +71,7 @@ this.entUser.CanFocus = true; this.entUser.Name = "entUser"; this.entUser.IsEditable = true; - this.entUser.InvisibleChar = '•'; + this.entUser.InvisibleChar = '\u2022'; this.table1.Add (this.entUser); global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entUser])); w3.TopAttach = ((uint)(1)); diff -Nru banshee-community-extensions-1.9.3/src/Ampache/Makefile.in banshee-community-extensions-1.9.5/src/Ampache/Makefile.in --- banshee-community-extensions-1.9.3/src/Ampache/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Ampache/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/AppIndicator/Makefile.in banshee-community-extensions-1.9.5/src/AppIndicator/Makefile.in --- banshee-community-extensions-1.9.3/src/AppIndicator/Makefile.in 2011-02-03 21:54:27.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/AppIndicator/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/AssemblyInfo.cs banshee-community-extensions-1.9.5/src/AssemblyInfo.cs --- banshee-community-extensions-1.9.3/src/AssemblyInfo.cs 2011-02-03 21:54:38.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/AssemblyInfo.cs 2011-03-10 17:46:51.000000000 +0000 @@ -1,5 +1,5 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("1.9.3")] +[assembly: AssemblyVersion("1.9.5")] diff -Nru banshee-community-extensions-1.9.3/src/Awn/Makefile.in banshee-community-extensions-1.9.5/src/Awn/Makefile.in --- banshee-community-extensions-1.9.3/src/Awn/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Awn/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/ClutterFlow/Banshee.ClutterFlow/Makefile.in banshee-community-extensions-1.9.5/src/ClutterFlow/Banshee.ClutterFlow/Makefile.in --- banshee-community-extensions-1.9.3/src/ClutterFlow/Banshee.ClutterFlow/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/ClutterFlow/Banshee.ClutterFlow/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/ClutterFlow/ClutterFlow/Makefile.in banshee-community-extensions-1.9.5/src/ClutterFlow/ClutterFlow/Makefile.in --- banshee-community-extensions-1.9.3/src/ClutterFlow/ClutterFlow/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/ClutterFlow/ClutterFlow/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/ClutterFlow/Makefile.in banshee-community-extensions-1.9.5/src/ClutterFlow/Makefile.in --- banshee-community-extensions-1.9.3/src/ClutterFlow/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/ClutterFlow/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/CoverWallpaper/Makefile.in banshee-community-extensions-1.9.5/src/CoverWallpaper/Makefile.in --- banshee-community-extensions-1.9.3/src/CoverWallpaper/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/CoverWallpaper/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Jamendo/Makefile.am banshee-community-extensions-1.9.5/src/Jamendo/Makefile.am --- banshee-community-extensions-1.9.3/src/Jamendo/Makefile.am 2011-01-06 19:21:18.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Jamendo/Makefile.am 2011-02-21 20:10:09.000000000 +0000 @@ -11,4 +11,8 @@ Jamendo.addin.xml \ ThemeIcons/22x22/categories/jamendo.png +if ENABLE_JAMENDO include $(top_srcdir)/build/build.mk +else +EXTRA_DIST = $(SOURCES) $(RESOURCES) +endif diff -Nru banshee-community-extensions-1.9.3/src/Jamendo/Makefile.in banshee-community-extensions-1.9.5/src/Jamendo/Makefile.in --- banshee-community-extensions-1.9.3/src/Jamendo/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Jamendo/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -38,7 +38,7 @@ $(top_srcdir)/build/build.environment.mk \ $(top_srcdir)/build/build.mk \ $(top_srcdir)/build/build.rules.mk -@ENABLE_TESTS_TRUE@am__append_1 = " $(NUNIT_LIBS) $(MONO_NUNIT_LIBS)" +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@am__append_1 = " $(NUNIT_LIBS) $(MONO_NUNIT_LIBS)" subdir = src/Jamendo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/extensions/alarmclock.m4 \ @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ @@ -338,43 +339,45 @@ # Initializers -MONO_BASE_PATH = -MONO_ADDINS_PATH = +@ENABLE_JAMENDO_TRUE@MONO_BASE_PATH = +@ENABLE_JAMENDO_TRUE@MONO_ADDINS_PATH = # All extensions are libraries -TARGET = library -DIR_BIN = $(top_builddir)/bin +@ENABLE_JAMENDO_TRUE@TARGET = library +@ENABLE_JAMENDO_TRUE@DIR_BIN = $(top_builddir)/bin # Install Paths -DEFAULT_INSTALL_DIR = $(pkglibdir) -EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions -UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq -BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE) -SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES)) \ - $(top_srcdir)/src/AssemblyInfo.cs -RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES)) -RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \ - -resource:$(resource),$(notdir $(resource))) - -INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)" -THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg) -THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE)) -ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET))) -ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION) -INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) -@ENABLE_TESTS_TRUE@ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" -FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE)) -DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/') -OUTPUT_FILES = \ - $(ASSEMBLY_FILE) \ - $(ASSEMBLY_FILE).mdb - -moduledir = $(EXTENSION_DIR) -module_SCRIPTS = $(OUTPUT_FILES) -EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) -CLEANFILES = $(OUTPUT_FILES) TestResult.xml -DISTCLEANFILES = *.pidb -MAINTAINERCLEANFILES = Makefile.in +@ENABLE_JAMENDO_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir) +@ENABLE_JAMENDO_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions +@ENABLE_JAMENDO_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq +@ENABLE_JAMENDO_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE) +@ENABLE_JAMENDO_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, \ +@ENABLE_JAMENDO_TRUE@ $(SOURCES)) \ +@ENABLE_JAMENDO_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs +@ENABLE_JAMENDO_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES)) +@ENABLE_JAMENDO_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \ +@ENABLE_JAMENDO_TRUE@ -resource:$(resource),$(notdir $(resource))) + +@ENABLE_JAMENDO_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)" +@ENABLE_JAMENDO_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg) +@ENABLE_JAMENDO_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE)) +@ENABLE_JAMENDO_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET))) +@ENABLE_JAMENDO_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION) +@ENABLE_JAMENDO_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" +@ENABLE_JAMENDO_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE)) +@ENABLE_JAMENDO_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/') +@ENABLE_JAMENDO_TRUE@OUTPUT_FILES = \ +@ENABLE_JAMENDO_TRUE@ $(ASSEMBLY_FILE) \ +@ENABLE_JAMENDO_TRUE@ $(ASSEMBLY_FILE).mdb + +@ENABLE_JAMENDO_TRUE@moduledir = $(EXTENSION_DIR) +@ENABLE_JAMENDO_TRUE@module_SCRIPTS = $(OUTPUT_FILES) +@ENABLE_JAMENDO_FALSE@EXTRA_DIST = $(SOURCES) $(RESOURCES) +@ENABLE_JAMENDO_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) +@ENABLE_JAMENDO_TRUE@CLEANFILES = $(OUTPUT_FILES) TestResult.xml +@ENABLE_JAMENDO_TRUE@DISTCLEANFILES = *.pidb +@ENABLE_JAMENDO_TRUE@MAINTAINERCLEANFILES = Makefile.in all: all-am .SUFFIXES: @@ -520,6 +523,8 @@ @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@ENABLE_JAMENDO_FALSE@install-data-hook: +@ENABLE_JAMENDO_FALSE@uninstall-hook: clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -604,55 +609,55 @@ uninstall-moduleSCRIPTS -@ENABLE_TESTS_TRUE@test: $(ASSEMBLY_FILE) -@ENABLE_TESTS_TRUE@ if test "x$(TEST_ASSEMBLY)" = "xyes"; then \ -@ENABLE_TESTS_TRUE@ LD_LIBRARY_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" \ -@ENABLE_TESTS_TRUE@ MONO_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${MONO_PATH+:$MONO_PATH}" \ -@ENABLE_TESTS_TRUE@ $(NUNIT_CONSOLE) -nologo -noshadow $(ASSEMBLY_FILE); \ -@ENABLE_TESTS_TRUE@ fi - -@ENABLE_TESTS_FALSE@test: - -check: test - -all: $(ASSEMBLY_FILE) theme-icons - -run: - @pushd $(top_builddir); \ - make run \ - popd; - -build-debug: - @echo $(DEP_LINK) - -$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE) - -$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) - @mkdir -p $(top_builddir)/bin - $(MCS) \ - $(GMCS_FLAGS) \ - $(ENABLE_TESTS_FLAG) \ - $(ASSEMBLY_BUILD_FLAGS) \ - -debug -target:$(TARGET) -out:$@ \ - $(BUILD_DEFINES) \ - $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) - @if [ -e $(srcdir)/$(notdir $@.config) ]; then \ - cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \ - fi; - @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \ - cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \ - fi; - -theme-icons: $(THEME_ICONS_SOURCE) - @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE) - -install-data-hook: $(THEME_ICONS_SOURCE) - @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) - $(EXTRA_INSTALL_DATA_HOOK) - -uninstall-hook: $(THEME_ICONS_SOURCE) - @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) - $(EXTRA_UNINSTALL_HOOK) +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@test: $(ASSEMBLY_FILE) +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ if test "x$(TEST_ASSEMBLY)" = "xyes"; then \ +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ LD_LIBRARY_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" \ +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ MONO_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${MONO_PATH+:$MONO_PATH}" \ +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ $(NUNIT_CONSOLE) -nologo -noshadow $(ASSEMBLY_FILE); \ +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_TRUE@ fi + +@ENABLE_JAMENDO_TRUE@@ENABLE_TESTS_FALSE@test: + +@ENABLE_JAMENDO_TRUE@check: test + +@ENABLE_JAMENDO_TRUE@all: $(ASSEMBLY_FILE) theme-icons + +@ENABLE_JAMENDO_TRUE@run: +@ENABLE_JAMENDO_TRUE@ @pushd $(top_builddir); \ +@ENABLE_JAMENDO_TRUE@ make run \ +@ENABLE_JAMENDO_TRUE@ popd; + +@ENABLE_JAMENDO_TRUE@build-debug: +@ENABLE_JAMENDO_TRUE@ @echo $(DEP_LINK) + +@ENABLE_JAMENDO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE) + +@ENABLE_JAMENDO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) +@ENABLE_JAMENDO_TRUE@ @mkdir -p $(top_builddir)/bin +@ENABLE_JAMENDO_TRUE@ $(MCS) \ +@ENABLE_JAMENDO_TRUE@ $(GMCS_FLAGS) \ +@ENABLE_JAMENDO_TRUE@ $(ENABLE_TESTS_FLAG) \ +@ENABLE_JAMENDO_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \ +@ENABLE_JAMENDO_TRUE@ -debug -target:$(TARGET) -out:$@ \ +@ENABLE_JAMENDO_TRUE@ $(BUILD_DEFINES) \ +@ENABLE_JAMENDO_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) +@ENABLE_JAMENDO_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \ +@ENABLE_JAMENDO_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \ +@ENABLE_JAMENDO_TRUE@ fi; +@ENABLE_JAMENDO_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \ +@ENABLE_JAMENDO_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \ +@ENABLE_JAMENDO_TRUE@ fi; + +@ENABLE_JAMENDO_TRUE@theme-icons: $(THEME_ICONS_SOURCE) +@ENABLE_JAMENDO_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE) + +@ENABLE_JAMENDO_TRUE@install-data-hook: $(THEME_ICONS_SOURCE) +@ENABLE_JAMENDO_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) +@ENABLE_JAMENDO_TRUE@ $(EXTRA_INSTALL_DATA_HOOK) + +@ENABLE_JAMENDO_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE) +@ENABLE_JAMENDO_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) +@ENABLE_JAMENDO_TRUE@ $(EXTRA_UNINSTALL_HOOK) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs banshee-community-extensions-1.9.5/src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs --- banshee-community-extensions-1.9.3/src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Banshee.Karaoke/KaraokeConfigDialog.cs 2011-02-21 22:30:33.000000000 +0000 @@ -0,0 +1,241 @@ +// +// KaraokeConfigDialog.cs +// +// Author: +// Frank Ziegler +// +// Copyright (c) 2011 Frank Ziegler +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; + +using Gtk; +using Mono.Addins; + +using Banshee.Gui.Dialogs; + +namespace Banshee.Karaoke +{ + + public class KaraokeConfigDialog : BansheeDialog + { + KaraokeService karaoke_service; + + private double default_filter_width = 100; + private double default_filter_band = 220; + + Gtk.Image preferences_image = new Gtk.Image (); + Gtk.Label header_label = new Gtk.Label (); + Gtk.Label description_label = new Gtk.Label (); + + Gtk.Label choose_level_label = new Gtk.Label (); + Gtk.Label choose_band_label = new Gtk.Label (); + Gtk.Label choose_width_label = new Gtk.Label (); + + Gtk.HScale level_scale = new Gtk.HScale (0, 100, 1); + Gtk.HScale band_scale = new Gtk.HScale (0, 441, 1); + Gtk.HScale width_scale = new Gtk.HScale (0, 100, 1); + + Gtk.Button default_button = new Gtk.Button (Gtk.Stock.Home); + + Gtk.Button cancel_button = new Gtk.Button (Gtk.Stock.Cancel); + Gtk.Button save_button = new Gtk.Button (Gtk.Stock.Save); + + float initial_level; + float initial_band; + float initial_width; + + public KaraokeConfigDialog (KaraokeService service, float current_level, float current_band, float current_width) + { + karaoke_service = service; + + initial_level = current_level; + initial_band = current_band; + initial_width = current_width; + + preferences_image.Yalign = 0f; + preferences_image.IconName = "gtk-preferences"; + preferences_image.IconSize = (int)IconSize.Dialog; + + header_label.Text = String.Format ("{0}", AddinManager.CurrentLocalizer.GetString ("Karaoke configuration")); + header_label.UseMarkup = true; + header_label.Yalign = 0f; + header_label.Xalign = 0f; + description_label.Text = AddinManager.CurrentLocalizer.GetString ("You can alter the parameters of the karaoke effect here and " + + "define custom filter-band, filter-width and effect level."); + description_label.Yalign = 0f; + description_label.Xalign = 0f; + description_label.Wrap = true; + + choose_level_label.Text = AddinManager.CurrentLocalizer.GetString ("Effect Level:"); + choose_band_label.Text = AddinManager.CurrentLocalizer.GetString ("Filter Band:"); + choose_width_label.Text = AddinManager.CurrentLocalizer.GetString ("Filter Width:"); + choose_level_label.Xalign = choose_band_label.Xalign = choose_width_label.Xalign = 0f; + + level_scale.Digits = 0; + level_scale.DrawValue = true; + level_scale.TooltipText = AddinManager.CurrentLocalizer.GetString ("The effect level defines to what degree the voice " + + "frequencies are reduced."); + level_scale.ValuePos = PositionType.Right; + level_scale.Value = current_level * 100; + level_scale.ValueChanged += OnLevelValueChanged; + band_scale.Digits = 0; + band_scale.DrawValue = true; + band_scale.TooltipText = AddinManager.CurrentLocalizer.GetString ("The filter band defines position of filter within " + + "the frequency spectrum."); + band_scale.ValuePos = PositionType.Right; + band_scale.Value = current_band; + band_scale.ValueChanged += OnBandValueChanged; + width_scale.Digits = 0; + width_scale.DrawValue = true; + width_scale.TooltipText = AddinManager.CurrentLocalizer.GetString ("The filter width defines how wide the spectrum " + + "of the filtered frequencies is."); + width_scale.ValuePos = PositionType.Right; + width_scale.Value = current_width; + width_scale.ValueChanged += OnWidthValueChanged; + + default_button.Label = AddinManager.CurrentLocalizer.GetString ("Restore _defaults"); + default_button.Image = new Image ("gtk-home", IconSize.Button); + + cancel_button.Label = AddinManager.CurrentLocalizer.GetString ("_Cancel"); + cancel_button.Image = new Image ("gtk-cancel", IconSize.Button); + save_button.Label = AddinManager.CurrentLocalizer.GetString ("_Save"); + save_button.Image = new Image ("gtk-save", IconSize.Button); + + HBox main_container = new HBox (); + VBox action_container = new VBox (); + + action_container.PackStart (header_label, true, true, 0); + action_container.PackStart (description_label, true, true, 0); + + Table table = new Table (3, 2, false); + table.RowSpacing = 6; + table.ColumnSpacing = 12; + table.Attach (choose_level_label, 0, 1, 0, 1, + AttachOptions.Fill, AttachOptions.Fill, 0, 0); + table.Attach (level_scale, 1, 2, 0, 1, + AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Fill, 0, 0); + table.Attach (choose_band_label, 0, 1, 1, 2, + AttachOptions.Fill, AttachOptions.Fill, 0, 0); + table.Attach (band_scale, 1, 2, 1, 2, + AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Fill, 0, 0); + table.Attach (choose_width_label, 0, 1, 2, 3, + AttachOptions.Fill, AttachOptions.Fill, 0, 0); + table.Attach (width_scale, 1, 2, 2, 3, + AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Fill, 0, 0); + + action_container.PackStart (table, true, true, 5); + + main_container.PackStart (preferences_image, false, true, 5); + main_container.PackEnd (action_container, true, true, 5); + this.VBox.PackStart (main_container, true, true, 5); + + AddActionWidget (default_button, ResponseType.None); + + AddActionWidget (cancel_button, 0); + AddActionWidget (save_button, 0); + + default_button.Clicked += new EventHandler (OnDefaultButtonClicked); + cancel_button.Clicked += new EventHandler (OnCancelButtonClicked); + save_button.Clicked += new EventHandler (OnSaveButtonClicked); + + Title = "Karaoke configuration"; + IconName = "gtk-preferences"; + HeightRequest = 260; + WidthRequest = 500; + + ShowAll (); + } + + void OnLevelValueChanged (object sender, EventArgs e) + { + karaoke_service.ApplyKaraokeEffectLevel ((float)(level_scale.Value / 100)); + } + + void OnBandValueChanged (object sender, EventArgs e) + { + karaoke_service.ApplyKaraokeFilterBand ((float)band_scale.Value); + } + + void OnWidthValueChanged (object sender, EventArgs e) + { + karaoke_service.ApplyKaraokeFilterWidth ((float)width_scale.Value); + } + + /// + /// Handles click on the Default button + /// + /// + /// A -- not used + /// + /// + /// A -- not used + /// + private void OnDefaultButtonClicked (object o, EventArgs a) + { + level_scale.Value = 100; + band_scale.Value = default_filter_band; + width_scale.Value = default_filter_width; + } + + /// + /// Handles click on the Cancel button + /// + /// + /// A -- not used + /// + /// + /// A -- not used + /// + private void OnCancelButtonClicked (object o, EventArgs a) + { + karaoke_service.ApplyKaraokeEffectLevel (initial_level); + karaoke_service.ApplyKaraokeFilterBand (initial_band); + karaoke_service.ApplyKaraokeFilterWidth (initial_width); + + Destroy (); + } + + /// + /// Sets the configuration and saves it to SchemaEntries + /// + /// + /// A -- not used + /// + /// + /// A -- not used + /// + private void OnSaveButtonClicked (object o, EventArgs a) + { + KaraokeService.EffectLevelEntry.Set ((int)level_scale.Value); + karaoke_service.EffectLevel = (float)(level_scale.Value / 100); + + KaraokeService.FilterBandEntry.Set ((int)band_scale.Value); + karaoke_service.FilterBand = (float)band_scale.Value; + + KaraokeService.FilterWidthEntry.Set ((int)width_scale.Value); + karaoke_service.FilterWidth = (float)width_scale.Value; + + Destroy (); + } + + } +} + diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Banshee.Karaoke/KaraokeService.cs banshee-community-extensions-1.9.5/src/Karaoke/Banshee.Karaoke/KaraokeService.cs --- banshee-community-extensions-1.9.3/src/Karaoke/Banshee.Karaoke/KaraokeService.cs 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Banshee.Karaoke/KaraokeService.cs 2011-03-08 18:39:52.000000000 +0000 @@ -0,0 +1,276 @@ +// +// KaraokeService.cs +// +// Authors: +// Frank Ziegler +// +// Copyright (C) 2011 Frank Ziegler +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; + +using Mono.Addins; + +using Banshee.ServiceStack; +using Banshee.Streamrecorder.Gst; +using Banshee.Gui; +using Banshee.Configuration; + +namespace Banshee.Karaoke +{ + + public class KaraokeService : IExtensionService, IDelayedInitializeService, IDisposable + { + + Bin audiobin; + Bin playbin; + Bin audiotee; + Element audiokaraoke; + + bool has_karaoke = false; + + private Gtk.ActionGroup actions; + private InterfaceActionService action_service; + private uint ui_menu_id; + private uint ui_button_id; + + private bool karaoke_enabled = true; + + private float effect_level = 1.0f; + private float filter_band = 220.0f; + private float filter_width = 100.0f; + + public KaraokeService () + { + karaoke_enabled = IsKaraokeEnabledEntry.Get ().Equals ("True") ? true : false; + effect_level = (float)EffectLevelEntry.Get (); + effect_level = effect_level / 100; + filter_band = (float)FilterBandEntry.Get (); + filter_width = (float)FilterWidthEntry.Get (); + } + + #region IExtensionService implementation + void IExtensionService.Initialize () + { + + has_karaoke = Marshaller.CheckGstPlugin ("audiokaraoke"); + Hyena.Log.Debug ("[Karaoke] GstPlugin audiokaraoke" + (has_karaoke ? "" : " not") + " found"); + if (!has_karaoke) { + Hyena.Log.Warning ("[Karaoke] audiokaraoke is not available, please install gstreamer-good-plugins"); + return; + } + + action_service = ServiceManager.Get (); + actions = new Gtk.ActionGroup ("Karaoke"); + + actions.Add (new Gtk.ActionEntry[] { new Gtk.ActionEntry ("KaraokeAction", null, + AddinManager.CurrentLocalizer.GetString ("_Karaoke"), null, null, null), + new Gtk.ActionEntry ("KaraokeConfigureAction", Gtk.Stock.Properties, + AddinManager.CurrentLocalizer.GetString ("_Configure"), null, + AddinManager.CurrentLocalizer.GetString ("Configure the Karaoke extension"), OnConfigure) }); + + Gdk.Pixbuf icon = new Gdk.Pixbuf (System.Reflection.Assembly.GetExecutingAssembly () + .GetManifestResourceStream ("microphone.png")); + + Gtk.IconSet iconset = new Gtk.IconSet (icon); + Gtk.IconFactory iconfactory = new Gtk.IconFactory (); + iconfactory.Add ("microphone", iconset); + iconfactory.AddDefault (); + + actions.Add (new Gtk.ToggleActionEntry[] { new Gtk.ToggleActionEntry ("KaraokeEnableAction", "microphone", + AddinManager.CurrentLocalizer.GetString ("_Activate Karaoke mode"), null, + AddinManager.CurrentLocalizer.GetString ("Activate Karaoke mode"), + OnActivateKaraoke, karaoke_enabled) }); + + action_service.UIManager.InsertActionGroup (actions, 0); + ui_menu_id = action_service.UIManager.AddUiFromResource ("KaraokeMenu.xml"); + ui_button_id = action_service.UIManager.AddUiFromResource ("KaraokeButton.xml"); + + } + + /// + /// Activates or deactivates Karaoke mode + /// + /// + /// A -- not used + /// + /// + /// A -- not used + /// + public void OnActivateKaraoke (object o, EventArgs ea) + { + karaoke_enabled = !karaoke_enabled; + IsKaraokeEnabledEntry.Set (karaoke_enabled.ToString ()); + + if (!karaoke_enabled) { + audiokaraoke.SetFloatProperty ("level", 0); + audiokaraoke.SetFloatProperty ("mono-level", 0); + } else { + audiokaraoke.SetFloatProperty ("level", effect_level); + audiokaraoke.SetFloatProperty ("mono-level", effect_level); + } + + } + + /// + /// Triggers configuration, shows the configuration dialog + /// + /// + /// A -- not used + /// + /// + /// A -- not used + /// + public void OnConfigure (object o, EventArgs ea) + { + new KaraokeConfigDialog (this, EffectLevel, FilterBand, FilterWidth); + } + + void IDelayedInitializeService.DelayedInitialize () + { + if (!has_karaoke) return; + + playbin = new Bin (ServiceManager.PlayerEngine.ActiveEngine.GetBaseElements ()[0]); + audiobin = new Bin (ServiceManager.PlayerEngine.ActiveEngine.GetBaseElements ()[1]); + audiotee = new Bin (ServiceManager.PlayerEngine.ActiveEngine.GetBaseElements ()[2]); + + if (playbin.IsNull ()) + Hyena.Log.Debug ("[Karaoke] Playbin is not yet initialized, cannot start Karaoke Mode"); + + audiokaraoke = audiobin.GetByName ("karaoke"); + + if (audiokaraoke.IsNull ()) + { + audiokaraoke = ElementFactory.Make ("audiokaraoke","karaoke"); + + //add audiokaraoke to audiobin + audiobin.Add (audiokaraoke); + + //setting new audiobin sink to audiokaraoke sink + GhostPad teepad = new GhostPad (audiobin.GetStaticPad ("sink").ToIntPtr ()); + Pad audiokaraokepad = audiokaraoke.GetStaticPad ("sink"); + teepad.SetTarget (audiokaraokepad); + + //link audiokaraoke sink and audiotee sink + audiokaraoke.Link (audiotee); + } + + if (!karaoke_enabled) { + audiokaraoke.SetFloatProperty ("level", 0); + audiokaraoke.SetFloatProperty ("mono-level", 0); + } else { + audiokaraoke.SetFloatProperty ("level", effect_level); + audiokaraoke.SetFloatProperty ("mono-level", effect_level); + } + + //Hyena.Log.DebugFormat ("Karaoke service has been initialized! {0}", audiobin.ToString ()); + } + #endregion + + #region IDisposable implementation + void IDisposable.Dispose () + { + if (!playbin.IsNull ()) + { + audiokaraoke.SetFloatProperty ("level", 0); + audiokaraoke.SetFloatProperty ("mono-level", 0); + } + action_service.UIManager.RemoveUi (ui_menu_id); + action_service.UIManager.RemoveUi (ui_button_id); + action_service.UIManager.RemoveActionGroup (actions); + actions = null; + } + #endregion + + /// + /// The service name + /// + string IService.ServiceName { + get { return "KaraokeService"; } + } + + public bool IsKaraokeEnabled + { + get { return karaoke_enabled; } + } + + public void ApplyKaraokeEffectLevel (float new_level) + { + if (!karaoke_enabled) return; + audiokaraoke.SetFloatProperty ("level", new_level); + audiokaraoke.SetFloatProperty ("mono-level", new_level); + } + + public float EffectLevel + { + get { return effect_level; } + set + { + effect_level = value; + ApplyKaraokeEffectLevel (effect_level); + } + } + + public void ApplyKaraokeFilterBand (float new_band) + { + audiokaraoke.SetFloatProperty ("filter-band", new_band); + } + + public float FilterBand + { + get { return filter_band; } + set + { + filter_band = value; + ApplyKaraokeFilterBand (filter_band); + } + } + + public void ApplyKaraokeFilterWidth (float new_width) + { + audiokaraoke.SetFloatProperty ("filter-width", new_width); + } + + public float FilterWidth + { + get { return filter_width; } + set + { + filter_width = value; + ApplyKaraokeFilterWidth (filter_width); + } + } + + public static readonly SchemaEntry IsKaraokeEnabledEntry = new SchemaEntry ( + "plugins.karaoke", "karaoke_enabled", "", "Is Karaoke mode enabled", "Is Karaoke mode enabled"); + + public static readonly SchemaEntry EffectLevelEntry = new SchemaEntry ( + "plugins.karaoke", "effect_level", 100, "Effect Level", "Effect Level"); + + public static readonly SchemaEntry FilterBandEntry = new SchemaEntry ( + "plugins.karaoke", "filter_band", 220, "Filter Band", "Filter Band"); + + public static readonly SchemaEntry FilterWidthEntry = new SchemaEntry ( + "plugins.karaoke", "filter_width", 100, "Filter Width", "Filter Width"); + + } +} diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Karaoke.addin.xml banshee-community-extensions-1.9.5/src/Karaoke/Karaoke.addin.xml --- banshee-community-extensions-1.9.3/src/Karaoke/Karaoke.addin.xml 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Karaoke.addin.xml 2011-02-21 20:46:50.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Makefile.am banshee-community-extensions-1.9.5/src/Karaoke/Makefile.am --- banshee-community-extensions-1.9.3/src/Karaoke/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Makefile.am 2011-02-21 20:10:11.000000000 +0000 @@ -0,0 +1,21 @@ +ASSEMBLY = Banshee.Karaoke + +REFS = -r:$(top_builddir)/bin/Banshee.Streamrecorder.dll + +LINK = $(BANSHEE_LIBS) $(REFS) + +SOURCES = \ + Banshee.Karaoke/KaraokeConfigDialog.cs \ + Banshee.Karaoke/KaraokeService.cs + +RESOURCES = \ + Karaoke.addin.xml \ + Resources/KaraokeButton.xml \ + Resources/KaraokeMenu.xml \ + Resources/microphone.png + +if ENABLE_KARAOKE +include $(top_srcdir)/build/build.mk +else +EXTRA_DIST = $(SOURCES) $(RESOURCES) +endif diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Makefile.in banshee-community-extensions-1.9.5/src/Karaoke/Makefile.in --- banshee-community-extensions-1.9.3/src/Karaoke/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -0,0 +1,664 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build/build.environment.mk \ + $(top_srcdir)/build/build.mk \ + $(top_srcdir)/build/build.rules.mk +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@am__append_1 = " $(NUNIT_LIBS) $(MONO_NUNIT_LIBS)" +subdir = src/Karaoke +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/build/m4/extensions/alarmclock.m4 \ + $(top_srcdir)/build/m4/extensions/ampache.m4 \ + $(top_srcdir)/build/m4/extensions/appindicator.m4 \ + $(top_srcdir)/build/m4/extensions/awn.m4 \ + $(top_srcdir)/build/m4/extensions/banshee.m4 \ + $(top_srcdir)/build/m4/extensions/clutterflow.m4 \ + $(top_srcdir)/build/m4/extensions/common.m4 \ + $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ + $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ + $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ + $(top_srcdir)/build/m4/extensions/lcd.m4 \ + $(top_srcdir)/build/m4/extensions/lirc.m4 \ + $(top_srcdir)/build/m4/extensions/liveradio.m4 \ + $(top_srcdir)/build/m4/extensions/lyrics.m4 \ + $(top_srcdir)/build/m4/extensions/magnatune.m4 \ + $(top_srcdir)/build/m4/extensions/mirage.m4 \ + $(top_srcdir)/build/m4/extensions/openvp.m4 \ + $(top_srcdir)/build/m4/extensions/radiostationfetcher.m4 \ + $(top_srcdir)/build/m4/extensions/randombylastfm.m4 \ + $(top_srcdir)/build/m4/extensions/streamrecorder.m4 \ + $(top_srcdir)/build/m4/extensions/telepathy.m4 \ + $(top_srcdir)/build/m4/extensions/zeitgeistdp.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(moduledir)" +SCRIPTS = $(module_SCRIPTS) +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ +APPINDICATORSHARP_CFLAGS = @APPINDICATORSHARP_CFLAGS@ +APPINDICATORSHARP_LIBS = @APPINDICATORSHARP_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BANSHEE_CFLAGS = @BANSHEE_CFLAGS@ +BANSHEE_EXTDIR = @BANSHEE_EXTDIR@ +BANSHEE_LASTFM_CFLAGS = @BANSHEE_LASTFM_CFLAGS@ +BANSHEE_LASTFM_LIBS = @BANSHEE_LASTFM_LIBS@ +BANSHEE_LIBDIR = @BANSHEE_LIBDIR@ +BANSHEE_LIBS = @BANSHEE_LIBS@ +BANSHEE_NOWPLAYING_CFLAGS = @BANSHEE_NOWPLAYING_CFLAGS@ +BANSHEE_NOWPLAYING_LIBS = @BANSHEE_NOWPLAYING_LIBS@ +BANSHEE_WEBBROWSER_CFLAGS = @BANSHEE_WEBBROWSER_CFLAGS@ +BANSHEE_WEBBROWSER_LIBS = @BANSHEE_WEBBROWSER_LIBS@ +BUILD_HOST_CPU = @BUILD_HOST_CPU@ +BUILD_HOST_OS = @BUILD_HOST_OS@ +BUILD_TIME = @BUILD_TIME@ +BUILD_VENDOR_ID = @BUILD_VENDOR_ID@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_BUNDLEFILES = @CLUTTER_BUNDLEFILES@ +CLUTTER_SHARP_CFLAGS = @CLUTTER_SHARP_CFLAGS@ +CLUTTER_SHARP_LIBS = @CLUTTER_SHARP_LIBS@ +CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_RELEASE = @ENABLE_RELEASE@ +EXEEXT = @EXEEXT@ +EXTENSION_DIR = @EXTENSION_DIR@ +F77 = @F77@ +FC = @FC@ +FFTW3F_CFLAGS = @FFTW3F_CFLAGS@ +FFTW3F_LIBS = @FFTW3F_LIBS@ +FGREP = @FGREP@ +GCONFSHARP_CFLAGS = @GCONFSHARP_CFLAGS@ +GCONFSHARP_LIBS = @GCONFSHARP_LIBS@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GCONF_SHARP_20_CFLAGS = @GCONF_SHARP_20_CFLAGS@ +GCONF_SHARP_20_LIBS = @GCONF_SHARP_20_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GMCS_FLAGS = @GMCS_FLAGS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@ +GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@ +GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +JAY = @JAY@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSAMPLERATE_CFLAGS = @LIBSAMPLERATE_CFLAGS@ +LIBSAMPLERATE_LIBS = @LIBSAMPLERATE_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEFLAGS = @MAKEFLAGS@ +MAKEINFO = @MAKEINFO@ +MCS = @MCS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ +MONO_CFLAGS = @MONO_CFLAGS@ +MONO_LIBS = @MONO_LIBS@ +MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@ +MONO_MODULE_LIBS = @MONO_MODULE_LIBS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NOTIFYSHARP_CFLAGS = @NOTIFYSHARP_CFLAGS@ +NOTIFYSHARP_LIBS = @NOTIFYSHARP_LIBS@ +NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@ +NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@ +NUNIT_CFLAGS = @NUNIT_CFLAGS@ +NUNIT_CONSOLE = @NUNIT_CONSOLE@ +NUNIT_LIBS = @NUNIT_LIBS@ +OBJC = @OBJC@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +Q = @Q@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TAO_FREEGLUT_CFLAGS = @TAO_FREEGLUT_CFLAGS@ +TAO_FREEGLUT_LIBS = @TAO_FREEGLUT_LIBS@ +TAO_OPENGL_CFLAGS = @TAO_OPENGL_CFLAGS@ +TAO_OPENGL_LIBS = @TAO_OPENGL_LIBS@ +TAO_SDL_CFLAGS = @TAO_SDL_CFLAGS@ +TAO_SDL_LIBS = @TAO_SDL_LIBS@ +USE_NLS = @USE_NLS@ +V = @V@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +ZEITGEIST_SHARP_CFLAGS = @ZEITGEIST_SHARP_CFLAGS@ +ZEITGEIST_SHARP_LIBS = @ZEITGEIST_SHARP_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +expanded_bindir = @expanded_bindir@ +expanded_datadir = @expanded_datadir@ +expanded_libdir = @expanded_libdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +shavedir = @shavedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ASSEMBLY = Banshee.Karaoke +REFS = -r:$(top_builddir)/bin/Banshee.Streamrecorder.dll +LINK = $(BANSHEE_LIBS) $(REFS) $(am__append_1) +SOURCES = \ + Banshee.Karaoke/KaraokeConfigDialog.cs \ + Banshee.Karaoke/KaraokeService.cs + +RESOURCES = \ + Karaoke.addin.xml \ + Resources/KaraokeButton.xml \ + Resources/KaraokeMenu.xml \ + Resources/microphone.png + + +# Initializers +@ENABLE_KARAOKE_TRUE@MONO_BASE_PATH = +@ENABLE_KARAOKE_TRUE@MONO_ADDINS_PATH = + +# All extensions are libraries +@ENABLE_KARAOKE_TRUE@TARGET = library +@ENABLE_KARAOKE_TRUE@DIR_BIN = $(top_builddir)/bin + +# Install Paths +@ENABLE_KARAOKE_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir) +@ENABLE_KARAOKE_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions +@ENABLE_KARAOKE_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq +@ENABLE_KARAOKE_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE) +@ENABLE_KARAOKE_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, \ +@ENABLE_KARAOKE_TRUE@ $(SOURCES)) \ +@ENABLE_KARAOKE_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs +@ENABLE_KARAOKE_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES)) +@ENABLE_KARAOKE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \ +@ENABLE_KARAOKE_TRUE@ -resource:$(resource),$(notdir $(resource))) + +@ENABLE_KARAOKE_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)" +@ENABLE_KARAOKE_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg) +@ENABLE_KARAOKE_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE)) +@ENABLE_KARAOKE_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET))) +@ENABLE_KARAOKE_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION) +@ENABLE_KARAOKE_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" +@ENABLE_KARAOKE_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE)) +@ENABLE_KARAOKE_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/') +@ENABLE_KARAOKE_TRUE@OUTPUT_FILES = \ +@ENABLE_KARAOKE_TRUE@ $(ASSEMBLY_FILE) \ +@ENABLE_KARAOKE_TRUE@ $(ASSEMBLY_FILE).mdb + +@ENABLE_KARAOKE_TRUE@moduledir = $(EXTENSION_DIR) +@ENABLE_KARAOKE_TRUE@module_SCRIPTS = $(OUTPUT_FILES) +@ENABLE_KARAOKE_FALSE@EXTRA_DIST = $(SOURCES) $(RESOURCES) +@ENABLE_KARAOKE_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) +@ENABLE_KARAOKE_TRUE@CLEANFILES = $(OUTPUT_FILES) TestResult.xml +@ENABLE_KARAOKE_TRUE@DISTCLEANFILES = *.pidb +@ENABLE_KARAOKE_TRUE@MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Karaoke/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Karaoke/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-moduleSCRIPTS: $(module_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(moduledir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(moduledir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-moduleSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(moduledir)" && rm -f $$files + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(SCRIPTS) +installdirs: + for dir in "$(DESTDIR)$(moduledir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@ENABLE_KARAOKE_FALSE@install-data-hook: +@ENABLE_KARAOKE_FALSE@uninstall-hook: +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-moduleSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-moduleSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: install-am install-data-am install-strip uninstall-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-hook install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-moduleSCRIPTS install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ + uninstall-moduleSCRIPTS + + +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@test: $(ASSEMBLY_FILE) +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ if test "x$(TEST_ASSEMBLY)" = "xyes"; then \ +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ LD_LIBRARY_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" \ +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ MONO_PATH="$(BANSHEE_LIBDIR):$(BANSHEE_EXTDIR):$(EXTENSION_DIR)/..:$(EXTENSION_DIR)${MONO_PATH+:$MONO_PATH}" \ +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ $(NUNIT_CONSOLE) -nologo -noshadow $(ASSEMBLY_FILE); \ +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_TRUE@ fi + +@ENABLE_KARAOKE_TRUE@@ENABLE_TESTS_FALSE@test: + +@ENABLE_KARAOKE_TRUE@check: test + +@ENABLE_KARAOKE_TRUE@all: $(ASSEMBLY_FILE) theme-icons + +@ENABLE_KARAOKE_TRUE@run: +@ENABLE_KARAOKE_TRUE@ @pushd $(top_builddir); \ +@ENABLE_KARAOKE_TRUE@ make run \ +@ENABLE_KARAOKE_TRUE@ popd; + +@ENABLE_KARAOKE_TRUE@build-debug: +@ENABLE_KARAOKE_TRUE@ @echo $(DEP_LINK) + +@ENABLE_KARAOKE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE) + +@ENABLE_KARAOKE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) +@ENABLE_KARAOKE_TRUE@ @mkdir -p $(top_builddir)/bin +@ENABLE_KARAOKE_TRUE@ $(MCS) \ +@ENABLE_KARAOKE_TRUE@ $(GMCS_FLAGS) \ +@ENABLE_KARAOKE_TRUE@ $(ENABLE_TESTS_FLAG) \ +@ENABLE_KARAOKE_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \ +@ENABLE_KARAOKE_TRUE@ -debug -target:$(TARGET) -out:$@ \ +@ENABLE_KARAOKE_TRUE@ $(BUILD_DEFINES) \ +@ENABLE_KARAOKE_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) +@ENABLE_KARAOKE_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \ +@ENABLE_KARAOKE_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \ +@ENABLE_KARAOKE_TRUE@ fi; +@ENABLE_KARAOKE_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \ +@ENABLE_KARAOKE_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \ +@ENABLE_KARAOKE_TRUE@ fi; + +@ENABLE_KARAOKE_TRUE@theme-icons: $(THEME_ICONS_SOURCE) +@ENABLE_KARAOKE_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE) + +@ENABLE_KARAOKE_TRUE@install-data-hook: $(THEME_ICONS_SOURCE) +@ENABLE_KARAOKE_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) +@ENABLE_KARAOKE_TRUE@ $(EXTRA_INSTALL_DATA_HOOK) + +@ENABLE_KARAOKE_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE) +@ENABLE_KARAOKE_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) +@ENABLE_KARAOKE_TRUE@ $(EXTRA_UNINSTALL_HOOK) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Resources/KaraokeButton.xml banshee-community-extensions-1.9.5/src/Karaoke/Resources/KaraokeButton.xml --- banshee-community-extensions-1.9.3/src/Karaoke/Resources/KaraokeButton.xml 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Resources/KaraokeButton.xml 2011-02-21 20:07:25.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru banshee-community-extensions-1.9.3/src/Karaoke/Resources/KaraokeMenu.xml banshee-community-extensions-1.9.5/src/Karaoke/Resources/KaraokeMenu.xml --- banshee-community-extensions-1.9.3/src/Karaoke/Resources/KaraokeMenu.xml 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Karaoke/Resources/KaraokeMenu.xml 2011-02-21 20:07:25.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + + + + Binary files /tmp/8bQSUN_Tc4/banshee-community-extensions-1.9.3/src/Karaoke/Resources/microphone.png and /tmp/5E2ZTz28rZ/banshee-community-extensions-1.9.5/src/Karaoke/Resources/microphone.png differ diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs 2011-02-03 20:55:54.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LastfmFingerprintService.cs 2011-02-12 13:46:43.000000000 +0000 @@ -218,18 +218,11 @@ void GetMoreInfo (TrackInfo track) { - string time = (DateTime.Now - new DateTime(1970, 1, 1)).TotalSeconds.ToString (); - var request = new LastfmRequest ("track.getInfo"); request.AddParameter ("artist", track.ArtistName); request.AddParameter ("track", track.TrackTitle); request.AddParameter ("mbid", track.MusicBrainzId); - request.AddParameter ("time", time); - request.AddParameter ("username", account.UserName); - request.AddParameter ("auth", VerifyUserRequest.ConvertToMd5(account.Password + time)); - request.AddParameter ("auth2", VerifyUserRequest.ConvertToMd5(account.Password.ToLower () + time)); - request.Send (); var response = request.GetResponseObject (); @@ -246,7 +239,10 @@ if (json_album != null) { var attr = (JsonObject)json_album["@attr"]; - track.TrackNumber = int.Parse ((string)attr["position"]); + int pos = 0; + if (int.TryParse ((string)attr["position"], out pos)) { + track.TrackNumber = pos; + } track.AlbumTitle = (string)json_album["title"]; track.AlbumMusicBrainzId = (string)json_album["mbid"]; track.AlbumArtist = (string)json_album["artist"]; @@ -254,6 +250,7 @@ } catch (Exception e) { Log.DebugException (e); + response.Dump (); } } diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs 2011-02-03 20:49:49.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginDialog.cs 2011-02-21 20:07:12.000000000 +0000 @@ -76,7 +76,7 @@ login_form = new LoginForm (account); login_form.AddSignUpButton (); - //login_form.AddAuthorizeButton (); + login_form.AddAuthorizeButton (); //TODO fix the verify user because always get bad pwd vbox.PackStart (login_form, true, true, 0); diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs 2011-02-03 20:47:01.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/LoginForm.cs 2011-02-21 20:07:12.000000000 +0000 @@ -121,18 +121,9 @@ private void OnAuthorize (object o, EventArgs args) { - //account.password = null; - VerifyUserRequest request = new VerifyUserRequest(); - if (request.Send (Username, Password)) { - Log.Debug ("Verify account OK"); - label.Text = "Athorization OK"; - label.ModifyText (StateType.Normal, new Gdk.Color (0, 1, 0)); - } - else { - label.Text = request.GetErrorString (); - label.ModifyText (StateType.Normal , new Gdk.Color (1, 0, 0)); - Log.Debug (request.GetErrorString ()); - } + LastfmCore.Account.SessionKey = null; + LastfmCore.Account.UserName = username_entry.Text.Trim (); + LastfmCore.Account.RequestAuthorization (); } public void Save () diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.in banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.in --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/liblastfmfpbridge/Makefile.in banshee-community-extensions-1.9.5/src/LastfmFingerprint/liblastfmfpbridge/Makefile.in --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/liblastfmfpbridge/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/liblastfmfpbridge/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -49,6 +49,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/LastfmFingerprint/Makefile.in banshee-community-extensions-1.9.5/src/LastfmFingerprint/Makefile.in --- banshee-community-extensions-1.9.3/src/LastfmFingerprint/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LastfmFingerprint/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -46,6 +46,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/LCD/Makefile.in banshee-community-extensions-1.9.5/src/LCD/Makefile.in --- banshee-community-extensions-1.9.3/src/LCD/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LCD/Makefile.in 2011-03-10 17:46:40.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lirc/Banshee.Lirc/Makefile.in banshee-community-extensions-1.9.5/src/Lirc/Banshee.Lirc/Makefile.in --- banshee-community-extensions-1.9.3/src/Lirc/Banshee.Lirc/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/Banshee.Lirc/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -51,6 +51,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lirc/GUITestHarness/Makefile.in banshee-community-extensions-1.9.5/src/Lirc/GUITestHarness/Makefile.in --- banshee-community-extensions-1.9.3/src/Lirc/GUITestHarness/Makefile.in 2011-02-03 21:54:28.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/GUITestHarness/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lirc/lirc-glue/lirc-glue.c banshee-community-extensions-1.9.5/src/Lirc/lirc-glue/lirc-glue.c --- banshee-community-extensions-1.9.3/src/Lirc/lirc-glue/lirc-glue.c 2010-02-19 16:39:15.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/lirc-glue/lirc-glue.c 2011-02-21 20:07:25.000000000 +0000 @@ -46,14 +46,15 @@ } else { lirc_glue_set_error (1); // means we don't have a code. totally normal for other unrelated button presses } + + free (code); + if (lirc_glue_get_error () < 1 ) { - free (code); - if (command != NULL) - return (command); - free (command); - return (NULL); + return (command); } } + + return (NULL); // daemon shut down so no next code } struct lirc_config *lirc_glue_getconfig () diff -Nru banshee-community-extensions-1.9.3/src/Lirc/lirc-glue/Makefile.in banshee-community-extensions-1.9.5/src/Lirc/lirc-glue/Makefile.in --- banshee-community-extensions-1.9.3/src/Lirc/lirc-glue/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/lirc-glue/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -46,6 +46,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lirc/Makefile.in banshee-community-extensions-1.9.5/src/Lirc/Makefile.in --- banshee-community-extensions-1.9.3/src/Lirc/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lirc/NUnitTests/Makefile.in banshee-community-extensions-1.9.5/src/Lirc/NUnitTests/Makefile.in --- banshee-community-extensions-1.9.3/src/Lirc/NUnitTests/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lirc/NUnitTests/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/LiveRadio/Makefile.in banshee-community-extensions-1.9.5/src/LiveRadio/Makefile.in --- banshee-community-extensions-1.9.3/src/LiveRadio/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/LiveRadio/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.IO/LyricsCache.cs banshee-community-extensions-1.9.5/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.IO/LyricsCache.cs --- banshee-community-extensions-1.9.3/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.IO/LyricsCache.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.IO/LyricsCache.cs 2011-02-21 20:07:25.000000000 +0000 @@ -37,7 +37,7 @@ private string GetLyricsFilename (string artist, string title) { - if (artist.Contains (Path.DirectorySeparatorChar.ToString ())) { + if (!String.IsNullOrEmpty (artist) && artist.Contains (Path.DirectorySeparatorChar.ToString ())) { artist = artist.Replace (Path.DirectorySeparatorChar.ToString (), "_"); } if (title.Contains (Path.DirectorySeparatorChar.ToString())) { diff -Nru banshee-community-extensions-1.9.3/src/Lyrics/Makefile.in banshee-community-extensions-1.9.5/src/Lyrics/Makefile.in --- banshee-community-extensions-1.9.3/src/Lyrics/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Lyrics/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Magnatune/Banshee.Magnatune/RadioSource.cs banshee-community-extensions-1.9.5/src/Magnatune/Banshee.Magnatune/RadioSource.cs --- banshee-community-extensions-1.9.3/src/Magnatune/Banshee.Magnatune/RadioSource.cs 2011-02-03 18:14:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Magnatune/Banshee.Magnatune/RadioSource.cs 2011-02-12 13:46:43.000000000 +0000 @@ -81,7 +81,7 @@ private uint ui_manager_id; private InterfaceActionService action_service; - public RadioSource () : base("Magnatune", "Magnatune", 200) + public RadioSource () : base("Magnatune", "Magnatune", 200, "magnatune") { Pixbuf icon = new Pixbuf (System.Reflection.Assembly.GetExecutingAssembly () .GetManifestResourceStream ("simple_icon.png")); diff -Nru banshee-community-extensions-1.9.3/src/Magnatune/Makefile.in banshee-community-extensions-1.9.5/src/Magnatune/Makefile.in --- banshee-community-extensions-1.9.3/src/Magnatune/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Magnatune/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Makefile.am banshee-community-extensions-1.9.5/src/Makefile.am --- banshee-community-extensions-1.9.3/src/Makefile.am 2010-12-11 16:45:26.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Makefile.am 2011-03-09 21:48:41.000000000 +0000 @@ -17,6 +17,7 @@ RadioStationFetcher \ RandomByLastfm \ StreamRecorder \ + Karaoke \ Telepathy \ ZeitgeistDataprovider diff -Nru banshee-community-extensions-1.9.3/src/Makefile.in banshee-community-extensions-1.9.5/src/Makefile.in --- banshee-community-extensions-1.9.3/src/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -46,6 +46,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ @@ -356,6 +357,7 @@ RadioStationFetcher \ RandomByLastfm \ StreamRecorder \ + Karaoke \ Telepathy \ ZeitgeistDataprovider diff -Nru banshee-community-extensions-1.9.3/src/Mirage/Banshee.Mirage/Makefile.in banshee-community-extensions-1.9.5/src/Mirage/Banshee.Mirage/Makefile.in --- banshee-community-extensions-1.9.3/src/Mirage/Banshee.Mirage/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Mirage/Banshee.Mirage/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Mirage/libmirageaudio/Makefile.in banshee-community-extensions-1.9.5/src/Mirage/libmirageaudio/Makefile.in --- banshee-community-extensions-1.9.3/src/Mirage/libmirageaudio/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Mirage/libmirageaudio/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -48,6 +48,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Mirage/Makefile.in banshee-community-extensions-1.9.5/src/Mirage/Makefile.in --- banshee-community-extensions-1.9.3/src/Mirage/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Mirage/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -46,6 +46,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Mirage/Mirage/Makefile.in banshee-community-extensions-1.9.5/src/Mirage/Mirage/Makefile.in --- banshee-community-extensions-1.9.3/src/Mirage/Mirage/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Mirage/Mirage/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -51,6 +51,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Mirage/Test/Makefile.in banshee-community-extensions-1.9.5/src/Mirage/Test/Makefile.in --- banshee-community-extensions-1.9.3/src/Mirage/Test/Makefile.in 2011-02-03 21:54:29.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Mirage/Test/Makefile.in 2011-03-10 17:46:41.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/Banshee.OpenVP/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/Banshee.OpenVP/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/Banshee.OpenVP/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/Banshee.OpenVP/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/Banshee.OpenVP.Visualizations/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/Banshee.OpenVP.Visualizations/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/Banshee.OpenVP.Visualizations/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/Banshee.OpenVP.Visualizations/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/Cdh.Affe/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/Cdh.Affe/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/Cdh.Affe/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/Cdh.Affe/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/Cdh.Affe.Tests/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/Cdh.Affe.Tests/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/Cdh.Affe.Tests/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/Cdh.Affe.Tests/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -45,6 +45,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/OpenVP/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/OpenVP/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/OpenVP/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/OpenVP/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/OpenVP.Core/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/OpenVP.Core/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/OpenVP.Core/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/OpenVP.Core/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/OpenVP/OpenVP.Scripting/Makefile.in banshee-community-extensions-1.9.5/src/OpenVP/OpenVP.Scripting/Makefile.in --- banshee-community-extensions-1.9.3/src/OpenVP/OpenVP.Scripting/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/OpenVP/OpenVP.Scripting/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/RadioStationFetcher/Makefile.in banshee-community-extensions-1.9.5/src/RadioStationFetcher/Makefile.in --- banshee-community-extensions-1.9.3/src/RadioStationFetcher/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/RadioStationFetcher/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/RandomByLastfm/Makefile.in banshee-community-extensions-1.9.5/src/RandomByLastfm/Makefile.in --- banshee-community-extensions-1.9.3/src/RandomByLastfm/Makefile.in 2011-02-03 21:54:30.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/RandomByLastfm/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Bin.cs banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Bin.cs --- banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Bin.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Bin.cs 2011-02-21 20:07:25.000000000 +0000 @@ -28,6 +28,8 @@ using System; using System.Runtime.InteropServices; +using System.Collections; +using System.Text; namespace Banshee.Streamrecorder.Gst { @@ -46,6 +48,32 @@ } [DllImport("libgstreamer-0.10.so.0")] + private static extern IntPtr gst_bin_iterate_sorted (IntPtr bin); + + public override string ToString () + { + IntPtr raw_ret = gst_bin_iterate_sorted (raw); + Iterator ret = raw_ret == IntPtr.Zero ? null : (Iterator) GLib.Opaque.GetOpaque (raw_ret, typeof (Iterator), false); + IEnumerator e = ret.GetEnumerator (); + if (e == null) return "null"; + StringBuilder res = new StringBuilder (); + while (e.MoveNext()) + { + if (e.Current != null) + { + GstObject o = new GstObject ((IntPtr)(e.Current)); + if (o != null) + { + res.Append (o.GetPathString ()); + res.Append ("!"); + } + } + } + return res.ToString ().Trim ('!').Replace ("!", " ! "); + + } + + [DllImport("libgstreamer-0.10.so.0")] private static extern IntPtr gst_bin_get_by_interface (IntPtr bin, GLib.GType iface); public IntPtr GetByInterface (GLib.GType iface) diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Element.cs banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Element.cs --- banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Element.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Element.cs 2011-02-21 20:07:25.000000000 +0000 @@ -40,6 +40,15 @@ } [DllImport("libgstreamer-0.10.so.0")] + static extern bool gst_element_remove_pad (IntPtr element, IntPtr pad); + + public bool RemovePad (Pad pad) + { + bool ret = gst_element_remove_pad (raw, pad.ToIntPtr ()); + return ret; + } + + [DllImport("libgstreamer-0.10.so.0")] static extern IntPtr gst_element_get_static_pad (IntPtr element, IntPtr name); public Pad GetStaticPad (string name) @@ -77,6 +86,14 @@ } } + [DllImport("libgstreamer-0.10.so.0", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_element_unlink (IntPtr src, IntPtr dest); + + public void Unlink (Element dest) + { + gst_element_unlink (raw, dest.ToIntPtr ()); + } + [DllImport("libgstreamer-0.10.so.0")] static extern int gst_element_set_state (IntPtr element, int state); diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/GhostPad.cs banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/GhostPad.cs --- banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/GhostPad.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/GhostPad.cs 2011-02-21 20:07:25.000000000 +0000 @@ -49,5 +49,14 @@ GLib.Marshaller.Free (native_name); } + [DllImport("libgstreamer-0.10.so.0")] + unsafe private static extern bool gst_ghost_pad_set_target (IntPtr element, IntPtr target); + + public bool SetTarget (Pad target) + { + bool ret = gst_ghost_pad_set_target (raw, target.ToIntPtr ()); + return ret; + } + } } diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/GstObject.cs banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/GstObject.cs --- banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/GstObject.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/GstObject.cs 2011-03-10 17:45:21.000000000 +0000 @@ -71,6 +71,14 @@ GLib.Marshaller.Free (native_value); } + public void SetProperty (string name, Element value) + { + IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr native_value = value.ToIntPtr (); + gst_util_set_object_arg (raw, native_name, native_value); + GLib.Marshaller.Free (native_name); + } + [DllImport("libgobject-2.0.so.0")] private static extern void g_object_set_property (IntPtr gobject, IntPtr property_name, ref GLib.Value value); @@ -101,6 +109,15 @@ GLib.Marshaller.Free (native_name); } + public void SetFloatProperty (string name, float value) + { + GLib.Value val = new GLib.Value (GLib.GType.Float); + val.Val = value; + IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + g_object_set_property (raw, native_name, ref val); + GLib.Marshaller.Free (native_name); + } + public IntPtr ToIntPtr () { return raw; diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Iterator.cs banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Iterator.cs --- banshee-community-extensions-1.9.3/src/StreamRecorder/Banshee.Streamrecorder/Gst/Iterator.cs 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Banshee.Streamrecorder/Gst/Iterator.cs 2011-02-21 20:07:25.000000000 +0000 @@ -0,0 +1,124 @@ +// +// Iterator.cs +// +// Author: +// Frank Ziegler +// +// Copyright (c) 2011 Frank Ziegler +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +namespace Banshee.Streamrecorder.Gst +{ + using System; + using System.Collections; + using System.Runtime.InteropServices; + + public partial class Iterator : GLib.Opaque, IEnumerable + { + + public Iterator (IntPtr raw) : base(raw) + { + } + + [DllImport("libgstreamer-0.10.dll")] + static extern int gst_iterator_next (IntPtr iterator, out IntPtr elem); + + [DllImport("libgstreamer-0.10.dll")] + static extern void gst_iterator_resync (IntPtr iterator); + + private class Enumerator : IEnumerator + { + + Iterator iterator; + Hashtable seen = new Hashtable (); + + private IntPtr current = IntPtr.Zero; + + public object Current { + get { return current; } + } + + public bool MoveNext () + { + IntPtr raw_ret; + bool retry = false; + + if (iterator.Handle == IntPtr.Zero) + return false; + + do { + int ret = gst_iterator_next (iterator.Handle, out raw_ret); + switch (ret) { + case 0: + return false; + case 1: + if (seen.Contains (raw_ret)) { + retry = true; + break; + } + seen.Add (raw_ret, null); + current = raw_ret; + return true; + case 2: + gst_iterator_resync (iterator.Handle); + retry = true; + break; + default: + case 3: + throw new Exception ("Error while iterating pads"); + } + } while (retry); + + return false; + } + + public void Reset () + { + seen.Clear (); + if (iterator.Handle != IntPtr.Zero) + gst_iterator_resync (iterator.Handle); + } + + public Enumerator (Iterator iterator) + { + this.iterator = iterator; + } + } + + private Enumerator enumerator = null; + + public IEnumerator GetEnumerator () + { + if (this.enumerator == null) + this.enumerator = new Enumerator (this); + return this.enumerator; + } + + [DllImport("libgstreamer-0.10.dll")] + static extern void gst_iterator_free (IntPtr iterator); + + ~Iterator () + { + if (Raw != IntPtr.Zero) + gst_iterator_free (Raw); + } + + } +} diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Makefile.am banshee-community-extensions-1.9.5/src/StreamRecorder/Makefile.am --- banshee-community-extensions-1.9.3/src/StreamRecorder/Makefile.am 2010-02-24 17:49:43.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Makefile.am 2011-02-21 20:07:25.000000000 +0000 @@ -13,6 +13,7 @@ Banshee.Streamrecorder/Gst/Format.cs \ Banshee.Streamrecorder/Gst/GhostPad.cs \ Banshee.Streamrecorder/Gst/GstObject.cs \ + Banshee.Streamrecorder/Gst/Iterator.cs \ Banshee.Streamrecorder/Gst/Marshaller.cs \ Banshee.Streamrecorder/Gst/Pad.cs \ Banshee.Streamrecorder/Gst/PadBlockCallback.cs \ diff -Nru banshee-community-extensions-1.9.3/src/StreamRecorder/Makefile.in banshee-community-extensions-1.9.5/src/StreamRecorder/Makefile.in --- banshee-community-extensions-1.9.3/src/StreamRecorder/Makefile.in 2011-02-03 21:54:31.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/StreamRecorder/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ @@ -336,6 +337,7 @@ Banshee.Streamrecorder/Gst/Format.cs \ Banshee.Streamrecorder/Gst/GhostPad.cs \ Banshee.Streamrecorder/Gst/GstObject.cs \ + Banshee.Streamrecorder/Gst/Iterator.cs \ Banshee.Streamrecorder/Gst/Marshaller.cs \ Banshee.Streamrecorder/Gst/Pad.cs \ Banshee.Streamrecorder/Gst/PadBlockCallback.cs \ diff -Nru banshee-community-extensions-1.9.3/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs banshee-community-extensions-1.9.5/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs --- banshee-community-extensions-1.9.3/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs 2010-08-13 20:05:55.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Data/ContactContainerSource.cs 2011-02-12 13:46:43.000000000 +0000 @@ -55,7 +55,7 @@ public static event EventHandler DownloadingAllowedChanged; public static event EventHandler StreamingAllowedChanged; - public ContactContainerSource (TelepathyService service) : base (AddinManager.CurrentLocalizer.GetString ("Contacts"), "Contacts", 1000) + public ContactContainerSource (TelepathyService service) : base (AddinManager.CurrentLocalizer.GetString ("Contacts"), "Contacts", 1000, "telepathy-container") { TelepathyService = service; TypeUniqueId = "telepathy-container"; diff -Nru banshee-community-extensions-1.9.3/src/Telepathy/Banshee.Telepathy/Makefile.in banshee-community-extensions-1.9.5/src/Telepathy/Banshee.Telepathy/Makefile.in --- banshee-community-extensions-1.9.3/src/Telepathy/Banshee.Telepathy/Makefile.in 2011-02-03 21:54:31.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Telepathy/Banshee.Telepathy/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -51,6 +51,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/Telepathy/Makefile.in banshee-community-extensions-1.9.5/src/Telepathy/Makefile.in --- banshee-community-extensions-1.9.3/src/Telepathy/Makefile.in 2011-02-03 21:54:31.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/Telepathy/Makefile.in 2011-03-10 17:46:42.000000000 +0000 @@ -46,6 +46,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \ diff -Nru banshee-community-extensions-1.9.3/src/ZeitgeistDataprovider/Makefile.in banshee-community-extensions-1.9.5/src/ZeitgeistDataprovider/Makefile.in --- banshee-community-extensions-1.9.3/src/ZeitgeistDataprovider/Makefile.in 2011-02-03 21:54:31.000000000 +0000 +++ banshee-community-extensions-1.9.5/src/ZeitgeistDataprovider/Makefile.in 2011-03-10 17:46:43.000000000 +0000 @@ -50,6 +50,7 @@ $(top_srcdir)/build/m4/extensions/common.m4 \ $(top_srcdir)/build/m4/extensions/coverwallpaper.m4 \ $(top_srcdir)/build/m4/extensions/jamendo.m4 \ + $(top_srcdir)/build/m4/extensions/karaoke.m4 \ $(top_srcdir)/build/m4/extensions/lastfmfingerprint.m4 \ $(top_srcdir)/build/m4/extensions/lcd.m4 \ $(top_srcdir)/build/m4/extensions/lirc.m4 \