diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/msn/webcam/libmimic | |
parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/msn/webcam/libmimic')
-rw-r--r-- | kopete/protocols/msn/webcam/libmimic/mimic-private.h | 6 | ||||
-rw-r--r-- | kopete/protocols/msn/webcam/libmimic/mimic.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/msn/webcam/libmimic/mimic-private.h b/kopete/protocols/msn/webcam/libmimic/mimic-private.h index adf59291..245793fb 100644 --- a/kopete/protocols/msn/webcam/libmimic/mimic-private.h +++ b/kopete/protocols/msn/webcam/libmimic/mimic-private.h @@ -21,9 +21,9 @@ #include "mimic.h" #define ENCODER_BUFFER_SIZE 16384 -#define ENCODER_QUALITY_DEFAULT 0 -#define ENCODER_QUALITY_MIN 0 -#define ENCODER_QUALITY_MAX 10000 +#define ENCODER_TQUALITY_DEFAULT 0 +#define ENCODER_TQUALITY_MIN 0 +#define ENCODER_TQUALITY_MAX 10000 struct _MimCtx { gboolean encoder_initialized; diff --git a/kopete/protocols/msn/webcam/libmimic/mimic.c b/kopete/protocols/msn/webcam/libmimic/mimic.c index 61abf9e8..2013022d 100644 --- a/kopete/protocols/msn/webcam/libmimic/mimic.c +++ b/kopete/protocols/msn/webcam/libmimic/mimic.c @@ -155,7 +155,7 @@ gboolean mimic_encoder_init(MimCtx *ctx, const MimicResEnum resolution) mimic_init(ctx, width, height); /* Set a default quality setting. */ - ctx->quality = ENCODER_QUALITY_DEFAULT; + ctx->quality = ENCODER_TQUALITY_DEFAULT; ctx->encoder_initialized = TRUE; @@ -300,8 +300,8 @@ gboolean mimic_set_property(MimCtx *ctx, const gchar *name, gpointer data) if (strcmp(name, "quality") == 0) { gint new_quality = *((gint *) data); - if (new_quality < ENCODER_QUALITY_MIN || - new_quality > ENCODER_QUALITY_MAX) + if (new_quality < ENCODER_TQUALITY_MIN || + new_quality > ENCODER_TQUALITY_MAX) { return FALSE; } |