diff options
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer')
47 files changed, 96 insertions, 96 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c index 24cc5a3f..6d8868d6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c @@ -279,7 +279,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(SIG_BLOCK,&set,NULL); err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) { if (err!=-EPIPE){ @@ -289,7 +289,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) g_warning("alsa_card_read: snd_pcm_readi() failed:%s.",snd_strerror(err)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(SIG_UNBLOCK,&set,NULL); return err*obj->frame_size; } @@ -322,7 +322,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(SIG_BLOCK,&set,NULL); if ((err=snd_pcm_writei(obj->write_handle,buf,size/obj->frame_size))<0){ if (err!=-EPIPE){ g_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err)); @@ -332,7 +332,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) if (err<0) g_warning("alsa_card_write: Error writing sound buffer (size=%i):%s",size,snd_strerror(err)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(SIG_UNBLOCK,&set,NULL); return err; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h index 1d7ba3a0..9ee33ef4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h @@ -27,7 +27,7 @@ #include <alsa/asoundlib.h> struct _AlsaCard { - SndCard parent; + SndCard tqparent; gchar *pcmdev; gchar *mixdev; snd_pcm_t *read_handle; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h index 3f5ad16f..30128191 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h @@ -44,14 +44,14 @@ static inline int val_seg(int val) static inline unsigned char s16_to_alaw(int pcm_val) { - int mask; + int tqmask; int seg; unsigned char aval; if (pcm_val >= 0) { - mask = 0xD5; + tqmask = 0xD5; } else { - mask = 0x55; + tqmask = 0x55; pcm_val = -pcm_val; if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -64,7 +64,7 @@ static inline unsigned char s16_to_alaw(int pcm_val) seg = val_seg(pcm_val); aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); } - return aval ^ mask; + return aval ^ tqmask; } /* @@ -119,16 +119,16 @@ static inline int alaw_to_s16(unsigned char a_val) static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit range) */ { - int mask; + int tqmask; int seg; unsigned char uval; if (pcm_val < 0) { pcm_val = 0x84 - pcm_val; - mask = 0x7f; + tqmask = 0x7f; } else { pcm_val += 0x84; - mask = 0xff; + tqmask = 0xff; } if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -141,7 +141,7 @@ static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit r * and complement the code word. */ uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); - return uval ^ mask; + return uval ^ tqmask; } /* diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c index 8a636c99..fe98df74 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c @@ -194,7 +194,7 @@ void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a) g_warning("hpux_snd_card_set_level: unsupported command."); return; } - gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_WRONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_SET_GAINS,&gain); @@ -210,7 +210,7 @@ gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way) int p=0,mix_fd,error; g_return_if_fail(obj->mixdev_name!=NULL); - gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_RDONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_GET_GAINS,&gain); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h index 0118e035..ae6f1c7c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h @@ -54,7 +54,7 @@ typedef struct { struct _JackCard { - SndCard parent; + SndCard tqparent; jack_client_t *client; gboolean jack_running; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c index e83eb8dc..d243bf76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c @@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b) static GList *g_list_append_if_new(GList *l,gpointer data) { GList *res=l; - if (g_list_find(res,data)==NULL) + if (g_list_tqfind(res,data)==NULL) res=g_list_append(res,data); return(res); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h index c10d76fd..9e13459e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass { /* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h index 66e9fa63..d76f2f62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass { /* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h index 8fbce4a0..dd8d330c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h @@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass { /* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h index e2130625..3fad63e3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h @@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass { /* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h index 8f61778b..af1ecc7c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h @@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass { /* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10DecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h index e72539ec..af900445 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h @@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass { /* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10EncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h index 6e038368..6e516db5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass { /* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h index b302b339..0192984e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass { /* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h index 55008939..71a04d3a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h @@ -57,7 +57,7 @@ struct _MSAVDecoderClass { /* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVDecoderClass MSAVDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h index b703a396..23da59f6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h @@ -58,7 +58,7 @@ struct _MSAVEncoderClass { /* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVEncoderClass MSAVEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h index 9b7c438b..2e03e525 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h @@ -44,7 +44,7 @@ typedef struct _MSCopyClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSCopyClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c index 623a3682..84859fda 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c @@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj) void ms_fdispatcher_class_init(MSFdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"fdispatcher"); - parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; - parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; - parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"fdispatcher"); + tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; + tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; + tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h index 4aea7e95..a50c5637 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h @@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass { /* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSFdispatcherClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c index cb69904c..c73081a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c @@ -130,7 +130,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) if ((m1_q!=-1) && (m2_q!=-1)){ /* link with queues */ ms_trace("m1_q=%i , m2_q=%i",m1_q,m2_q); - return ms_filter_link(m1,m1_q,m2,m2_q,LINK_QUEUE); + return ms_filter_link(m1,m1_q,m2,m2_q,LINK_TQUEUE); } if ((m1_f!=-1) && (m2_f!=-1)){ /* link with queues */ @@ -146,7 +146,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * This function links two MSFilter object between them. It must be used to make chains of filters. * All data outgoing from pin1 of m1 will go to the input pin2 of m2. @@ -165,7 +165,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype g_message("ms_filter_add_link: %s,%i -> %s,%i",m1->klass->name,pin1,m2->klass->name,pin2); switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 able to accept more queues connections ?*/ g_return_val_if_fail(m1->qoutputs<MS_FILTER_GET_CLASS(m1)->max_qoutputs,-EMLINK); g_return_val_if_fail(m2->qinputs<MS_FILTER_GET_CLASS(m2)->max_qinputs,-EMLINK); @@ -244,7 +244,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * Unlink @pin1 of filter @m1 from @pin2 of filter @m2. @linktype specifies what type of connection is removed. * @@ -254,7 +254,7 @@ int ms_filter_unlink(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2,gint linkty { switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 valid with their inputs and outputs ?*/ g_return_val_if_fail(m1->outqueues!=NULL,-EFAULT); g_return_val_if_fail(m2->inqueues!=NULL,-EFAULT); @@ -321,7 +321,7 @@ gint ms_filter_remove_links(MSFilter *m1, MSFilter *m2) if (rmf==m2){ j=find_iq(rmf,qo); if (j==-1) g_error("Could not find input queue: impossible case."); - ms_filter_unlink(m1,i,m2,j,LINK_QUEUE); + ms_filter_unlink(m1,i,m2,j,LINK_TQUEUE); removed=0; } } @@ -419,7 +419,7 @@ GList *filter_list=NULL; void ms_filter_register(MSFilterInfo *info) { gpointer tmp; - tmp=g_list_find(filter_list,info); + tmp=g_list_tqfind(filter_list,info); if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h index 89f91ad8..60c87411 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h @@ -98,7 +98,7 @@ typedef struct _MSFilterClass void (*destroy)(MSFilter *filter); guint attributes; #define FILTER_HAS_FIFOS (0x0001) -#define FILTER_HAS_QUEUES (0x0001<<1) +#define FILTER_HAS_TQUEUES (0x0001<<1) #define FILTER_IS_SOURCE (0x0001<<2) #define FILTER_IS_SINK (0x0001<<3) #define FILTER_CAN_SYNC (0x0001<<4) @@ -151,7 +151,7 @@ void ms_filter_destroy(MSFilter *f); #define LINK_DEFAULT 0 #define LINK_FIFO 1 -#define LINK_QUEUE 2 +#define LINK_TQUEUE 2 #define MSFILTER_VERSION(a,b,c) (((a)<<2)|((b)<<1)|(c)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h index a3d0a326..035a80fd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h @@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass { /* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h index b072e430..6995022c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h @@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass { /* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h index a6c9e9e8..7af095f8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h @@ -38,7 +38,7 @@ typedef struct _MSNoSync typedef struct _MSNoSyncClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSNoSyncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h index e359f271..78fa91ad 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h @@ -53,7 +53,7 @@ struct _MSOssReadClass { /* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSSoundReadClass parent_class; + MSSoundReadClass tqparent_class; }; typedef struct _MSOssReadClass MSOssReadClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h index 024eebb4..21abb2a1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h @@ -52,7 +52,7 @@ struct _MSOssWriteClass { /* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSSoundWriteClass parent_class; + MSSoundWriteClass tqparent_class; }; typedef struct _MSOssWriteClass MSOssWriteClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c index b924b0dd..20051b62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c @@ -43,22 +43,22 @@ void ms_qdispatcher_init(MSQdispatcher *obj) MS_FILTER(obj)->inqueues=obj->q_inputs; MS_FILTER(obj)->outqueues=obj->q_outputs; - memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_INPUTS); - memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_OUTPUTS); + memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_INPUTS); + memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_OUTPUTS); } void ms_qdispatcher_class_init(MSQdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"qdispatcher"); - parent_class->max_qinputs=MS_QDISPATCHER_MAX_INPUTS; - parent_class->max_qoutputs=MS_QDISPATCHER_MAX_OUTPUTS; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"qdispatcher"); + tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS; + tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS; - parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; } @@ -77,7 +77,7 @@ void ms_qdispatcher_process(MSQdispatcher *obj) MSMessage *m1,*m2; while ( (m1=ms_queue_get(inq))!=NULL){ /* dispatch incoming messages to output queues */ - for (i=0;i<MS_QDISPATCHER_MAX_OUTPUTS;i++){ + for (i=0;i<MS_TQDISPATCHER_MAX_OUTPUTS;i++){ outq=obj->q_outputs[i]; if (outq!=NULL){ m2=ms_message_dup(m1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h index 054440d1..66e80902 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h @@ -19,36 +19,36 @@ */ -#ifndef MSQDISPATCHER_H -#define MSQDISPATCHER_H +#ifndef MSTQDISPATCHER_H +#define MSTQDISPATCHER_H #include "msfilter.h" /*this is the class that implements a qdispatcher filter*/ -#define MS_QDISPATCHER_MAX_INPUTS 1 -#define MS_QDISPATCHER_MAX_OUTPUTS 5 +#define MS_TQDISPATCHER_MAX_INPUTS 1 +#define MS_TQDISPATCHER_MAX_OUTPUTS 5 typedef struct _MSQdispatcher { /* the MSQdispatcher derivates from MSFilter, so the MSFilter object MUST be the first of the MSQdispatcher object in order to the object mechanism to work*/ MSFilter filter; - MSQueue *q_inputs[MS_QDISPATCHER_MAX_INPUTS]; - MSQueue *q_outputs[MS_QDISPATCHER_MAX_OUTPUTS]; + MSQueue *q_inputs[MS_TQDISPATCHER_MAX_INPUTS]; + MSQueue *q_outputs[MS_TQDISPATCHER_MAX_OUTPUTS]; } MSQdispatcher; typedef struct _MSQdispatcherClass { /* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSQdispatcherClass; /* PUBLIC */ -#define MS_QDISPATCHER(filter) ((MSQdispatcher*)(filter)) -#define MS_QDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) +#define MS_TQDISPATCHER(filter) ((MSQdispatcher*)(filter)) +#define MS_TQDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) MSFilter * ms_qdispatcher_new(void); /* FOR INTERNAL USE*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h index 7094b088..ee8e1f44 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MSQUEUE_H -#define MSQUEUE_H +#ifndef MSTQUEUE_H +#define MSTQUEUE_H #include "msbuffer.h" diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h index b695f7da..a40f4fa0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h @@ -55,7 +55,7 @@ typedef struct _MSReadClass { /* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSReadClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h index a090afbf..715cdf3c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h @@ -59,7 +59,7 @@ struct _MSRingPlayerClass { /* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRingPlayerClass MSRingPlayerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h index 0f36c379..e9fd7937 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h @@ -55,7 +55,7 @@ struct _MSRtpRecvClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpRecvClass MSRtpRecvClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h index 96889964..56728f16 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h @@ -59,7 +59,7 @@ struct _MSRtpSendClass { /* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpSendClass MSRtpSendClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h index 0ce08618..b19c7e74 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h @@ -36,7 +36,7 @@ struct _MSSdlOut { - MSFilter parent; + MSFilter tqparent; MSQueue *input[2]; gint width,height; const gchar *format; @@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut; struct _MSSdlOutClass { - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSSdlOutClass MSSdlOutClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h index 9c5512b0..31349250 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h @@ -38,7 +38,7 @@ struct _MSSoundReadClass { /* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundRead *, gint devid); void (*start)(MSSoundRead *); void (*stop)(MSSoundRead*); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h index 8c1bab2d..e8fae0d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h @@ -38,7 +38,7 @@ struct _MSSoundWriteClass { /* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundWrite *, gint devid); void (*start)(MSSoundWrite *); void (*stop)(MSSoundWrite*); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h index 370af69e..9c7f7fc4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h @@ -27,7 +27,7 @@ struct _MSSpeexDec { - MSFilter parent; + MSFilter tqparent; MSQueue *inq[1]; /* speex has an input q because it can be variable bit rate */ MSFifo *outf[1]; void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexDec MSSpeexDec; struct _MSSpeexDecClass { - MSFilterClass parent; + MSFilterClass tqparent; }; typedef struct _MSSpeexDecClass MSSpeexDecClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h index f63edfcd..2325ba23 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h @@ -27,7 +27,7 @@ struct _MSSpeexEnc { - MSFilter parent; + MSFilter tqparent; MSFifo *inf[1]; MSQueue *outq[1]; /* speex has an output q because it can be variable bit rate */ void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexEnc MSSpeexEnc; struct _MSSpeexEncClass { - MSFilterClass parent; + MSFilterClass tqparent; }; typedef struct _MSSpeexEncClass MSSpeexEncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h index 3fe11350..b245ab86 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h @@ -42,7 +42,7 @@ typedef struct _MSTimer typedef struct _MSTimerClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSTimerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h index a61719ea..105e2603 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h @@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass so the MSFilter class MUST be the first of the MSTrueSpechDecoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h index 78024946..2637d3ac 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h @@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass so the MSFilter class MUST be the first of the MSTrueSpechEncoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h index ecd8eb32..2b4f7bd2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h @@ -50,8 +50,8 @@ #define VIDEO_SIZE_CIF_W 352 #define VIDEO_SIZE_CIF_H 288 -#define VIDEO_SIZE_QCIF_W 176 -#define VIDEO_SIZE_QCIF_H 144 +#define VIDEO_SIZE_TQCIF_W 176 +#define VIDEO_SIZE_TQCIF_H 144 #define VIDEO_SIZE_4CIF_W 704 #define VIDEO_SIZE_4CIF_H 576 #define VIDEO_SIZE_MAX_W VIDEO_SIZE_4CIF_W diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h index 3dc5ee04..e289ccc8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h @@ -27,7 +27,7 @@ struct _MSV4l { - MSVideoSource parent; + MSVideoSource tqparent; int fd; char *device; struct video_capability cap; @@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l; struct _MSV4lClass { - MSVideoSourceClass parent_class; + MSVideoSourceClass tqparent_class; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h index 897b239e..2189a6df 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h @@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass { /* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSVideoSource *s, const gchar *name); void (*start)(MSVideoSource *s); void (*stop)(MSVideoSource *s); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h index 8492a09d..55081793 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h @@ -45,7 +45,7 @@ typedef struct _MSWriteClass { /* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSWriteClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h index 0f1e09ab..6413c682 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h @@ -27,7 +27,7 @@ #define OSS_CARD_BUFFERS 3 struct _OssCard { - SndCard parent; + SndCard tqparent; gchar *dev_name; /* /dev/dsp0 for example */ gchar *mixdev_name; /* /dev/mixer0 for example */ gint fd; /* the file descriptor of the open soundcard, 0 if not open*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h index 2ffc6cd1..caf906df 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h @@ -24,7 +24,7 @@ typedef struct _PortAudioCard { - SndCard parent; + SndCard tqparent; PortAudioStream* stream; char *out_buffer, *out_buffer_read, *out_buffer_write, *out_buffer_end; char *in_buffer, *in_buffer_read, *in_buffer_write, *in_buffer_end; |