[Spice-commits] 2 commits - configure.ac gtk/channel-playback.c gtk/channel-record.c README

[Marc-André Lureau]

 README                 |    2 +-
 configure.ac           |   10 ----------
 gtk/channel-playback.c |    3 ++-
 gtk/channel-record.c   |    6 ++++--
 4 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 0f2afae6d617882f1aa6fe109f8431c9c06ea32b
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Apr 18 17:11:23 2012 +0200

    Allow to disable CELT at runtime
    
    We might want to make it a property, but having an environemnt variable
    is useful too, to override behaviour.

diff --git a/gtk/channel-playback.c b/gtk/channel-playback.c
index 32f8b1a..37b260e 100644
--- a/gtk/channel-playback.c
+++ b/gtk/channel-playback.c
@@ -87,7 +87,8 @@ static void spice_playback_channel_init(SpicePlaybackChannel *channel)
 {
     channel->priv = SPICE_PLAYBACK_CHANNEL_GET_PRIVATE(channel);
 
-    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_PLAYBACK_CAP_CELT_0_5_1);
+    if (!g_getenv("SPICE_DISABLE_CELT"))
+        spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_PLAYBACK_CAP_CELT_0_5_1);
     spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_PLAYBACK_CAP_VOLUME);
 }
 
diff --git a/gtk/channel-record.c b/gtk/channel-record.c
index fba385b..d93d908 100644
--- a/gtk/channel-record.c
+++ b/gtk/channel-record.c
@@ -93,7 +93,8 @@ static void spice_record_channel_init(SpiceRecordChannel *channel)
 {
     channel->priv = SPICE_RECORD_CHANNEL_GET_PRIVATE(channel);
 
-    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_RECORD_CAP_CELT_0_5_1);
+    if (!g_getenv("SPICE_DISABLE_CELT"))
+        spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_RECORD_CAP_CELT_0_5_1);
     spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_RECORD_CAP_VOLUME);
 }
 
@@ -317,7 +318,8 @@ static void channel_up(SpiceChannel *channel)
     SpiceRecordChannelPrivate *rc;
 
     rc = SPICE_RECORD_CHANNEL(channel)->priv;
-    if (spice_channel_test_capability(channel, SPICE_RECORD_CAP_CELT_0_5_1)) {
+    if (!g_getenv("SPICE_DISABLE_CELT") &&
+        spice_channel_test_capability(channel, SPICE_RECORD_CAP_CELT_0_5_1)) {
         rc->mode = SPICE_AUDIO_DATA_MODE_CELT_0_5_1;
     } else {
         rc->mode = SPICE_AUDIO_DATA_MODE_RAW;
commit de2798a001f85e13391837abcc50682998776396
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Sat Apr 21 20:46:36 2012 +0200

    build-sys: pyparsing req. moved to spice-common

diff --git a/README b/README
index e435994..06d459b 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ gstreamer-devel gstreamer-plugins-base-devel
 
 . If you build from git, you'll also need:
 
-libtool automake pyparsing vala perl-Text-CSV
+libtool automake vala perl-Text-CSV
 
 
 current state
diff --git a/configure.ac b/configure.ac
index 45d99dc..09129b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,16 +77,6 @@ dnl =========================================================================
 dnl Chek optional features
 
 srcdir="$(dirname $0)"
-if test ! -e "$srcdir/gtk/generated_marshallers.c"; then
-  AC_MSG_CHECKING([for pyparsing python module])
-  echo "import pyparsing" | ${PYTHON} - >/dev/null 2>&1
-  if test $? -ne 0 ; then
-    AC_MSG_RESULT([not found])
-    AC_MSG_ERROR([pyparsing python module is required to compile this package])
-  fi
-  AC_MSG_RESULT([found])
-fi
-
 if test ! -e "$srcdir/gtk/vncdisplaykeymap_osx2xtkbd.c"; then
   AC_MSG_CHECKING([for Text::CSV Perl module])
   perl -MText::CSV -e "" >/dev/null 2>&1