diff options
15 files changed, 4 insertions, 362 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 490e24db..088d2671 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -430,11 +430,6 @@ </item> <item> <property name='text'> - <string>hpux</string> - </property> - </item> - <item> - <property name='text'> <string>bsd</string> </property> </item> diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 4953b27c..9ae8e559 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -121,7 +121,7 @@ void PrinterDlgImpl::initDialog() _dictMngr->add("max reported print jobs",maxReportedPrintJobsSpin); _dictMngr->add("printing",printingCombo, new TQStringList(TQStringList() - << "sysv" << "aix" << "hpux" << "bsd" << "qnx" + << "sysv" << "aix" << "bsd" << "qnx" << "plp" << "lprng" << "softq" << "cups" << "nt" << "os2")); _dictMngr->add("printer driver",printerDriverEdit); diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro index 0ad01942..c4c08126 100644 --- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro +++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro @@ -138,5 +138,4 @@ contains(DEFINES, HAVE_PORTAUDIO) { #$$JINGLE_CPP/talk/third_party/mediastreamer/osscard.c \ #$$JINGLE_CPP/talk/third_party/mediastreamer/jackcard.c \ -#$$JINGLE_CPP/talk/third_party/mediastreamer/hpuxsndcard.c \ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/CMakeLists.txt index 8c5a923b..c3330da6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/CMakeLists.txt +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_library( mediastreamer STATIC_PIC mscopy.c msosswrite.c msossread.c msringplayer.c msrtprecv.c msrtpsend.c msAlawenc.c msAlawdec.c msMUlawenc.c msMUlawdec.c mstimer.c msqdispatcher.c msfdispatcher.c sndcard.c osscard.c - hpuxsndcard.c alsacard.c jackcard.c audiostream.c msspeexenc.c + alsacard.c jackcard.c audiostream.c msspeexenc.c msspeexdec.c msilbcdec.c msilbcenc.c ) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am index a81a4f8b..96df18a3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am @@ -27,7 +27,6 @@ libmediastreamer_la_SOURCES=msfilter.c msfilter.h msutils.h waveheader.h\ msfdispatcher.c msfdispatcher.h \ sndcard.c sndcard.h \ osscard.c osscard.h\ - hpuxsndcard.c \ alsacard.c alsacard.h \ jackcard.c jackcard.h \ audiostream.c mediastream.h \ 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 deleted file mode 100644 index 8a636c99..00000000 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c +++ /dev/null @@ -1,301 +0,0 @@ -/* - The mediastreamer library aims at providing modular media processing and I/O - for linphone, but also for any telephony application. - Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "sndcard.h" -#include "osscard.h" - -#ifdef HAVE_SYS_AUDIO_H -#include <sys/audio.h> - - -#include "msossread.h" -#include "msosswrite.h" - -#include <errno.h> -#include <fcntl.h> - - -int hpuxsnd_open(HpuxSndCard *obj, int bits,int stereo, int rate) -{ - int fd; - int p=0,cond=0; - int i=0; - int min_size=0,blocksize=512; - /* do a quick non blocking open to be sure that we are not going to be blocked here - for the eternity */ - fd=open(obj->dev_name,O_RDWR|O_NONBLOCK); - if (fd<0) return -EWOULDBLOCK; - close(fd); - /* open the device */ - fd=open(obj->dev_name,O_RDWR); - - g_return_val_if_fail(fd>0,-errno); - - ioctl(fd,AUDIO_RESET,0); - ioctl(fd,AUDIO_SET_SAMPLE_RATE,rate); - ioctl(fd,AUDIO_SET_CHANNELS,stereo); - p=AUDIO_FORMAT_LINEAR16BIT; - ioctl(fd,AUDIO_SET_DATA_FORMAT,p); - /* ioctl(fd,AUDIO_GET_RXBUFSIZE,&min_size); does not work ? */ - min_size=2048; - - g_message("dsp blocksize is %i.",min_size); - obj->fd=fd; - obj->readpos=0; - obj->writepos=0; - SND_CARD(obj)->bits=bits; - SND_CARD(obj)->stereo=stereo; - SND_CARD(obj)->rate=rate; - SND_CARD(obj)->bsize=min_size; - return fd; -} - -int hpux_snd_card_probe(HpuxSndCard *obj,int bits,int stereo,int rate) -{ - return 2048; -} - - -int hpux_snd_card_open(HpuxSndCard *obj,int bits,int stereo,int rate) -{ - int fd; - obj->ref++; - if (obj->fd==0){ - fd=hpuxsnd_open(obj,bits,stereo,rate); - if (fd<0) { - obj->fd=0; - obj->ref--; - return -1; - } - } - SND_CARD(obj)->flags|=SND_CARD_FLAGS_OPENED; - return 0; -} - -void hpux_snd_card_close(HpuxSndCard *obj) -{ - int i; - obj->ref--; - if (obj->ref==0) { - close(obj->fd); - obj->fd=0; - SND_CARD(obj)->flags&=~SND_CARD_FLAGS_OPENED; - - } -} - -void hpux_snd_card_destroy(HpuxSndCard *obj) -{ - snd_card_uninit(SND_CARD(obj)); - g_free(obj->dev_name); - g_free(obj->mixdev_name); -} - -gboolean hpux_snd_card_can_read(HpuxSndCard *obj) -{ - struct timeval tout={0,0}; - int err; - fd_set fdset; - FD_ZERO(&fdset); - FD_SET(obj->fd,&fdset); - err=select(obj->fd+1,&fdset,NULL,NULL,&tout); - if (err>0) return TRUE; - else return FALSE; -} - -int hpux_snd_card_read(HpuxSndCard *obj,char *buf,int size) -{ - int err; - gint bsize=SND_CARD(obj)->bsize; - if (size<bsize){ - gint canread=MIN(bsize-obj->readpos,size); - if (obj->readbuf==NULL) obj->readbuf=g_malloc0(bsize); - if (obj->readpos==0){ - err=read(obj->fd,obj->readbuf,bsize); - if (err<0) { - g_warning("hpux_snd_card_read: read() failed:%s.",strerror(errno)); - return -1; - } - } - - memcpy(buf,&obj->readbuf[obj->readpos],canread); - obj->readpos+=canread; - if (obj->readpos>=bsize) obj->readpos=0; - return canread; - }else{ - err=read(obj->fd,buf,size); - if (err<0) { - g_warning("hpux_snd_card_read: read-2() failed:%s.",strerror(errno)); - } - return err; - } - -} - -int hpux_snd_card_write(HpuxSndCard *obj,char *buf,int size) -{ - int err; - gint bsize=SND_CARD(obj)->bsize; - if (size<bsize){ - gint canwrite=MIN(bsize-obj->writepos,size); - if (obj->writebuf==NULL) obj->writebuf=g_malloc0(bsize); - - memcpy(&obj->writebuf[obj->writepos],buf,canwrite); - obj->writepos+=canwrite; - if (obj->writepos>=bsize){ - err=write(obj->fd,obj->writebuf,bsize); - } - return canwrite; - }else{ - return write(obj->fd,buf,bsize); - } -} - -#define SND_CARD_LEVEL_TO_HPUX_LEVEL(a) (((a)*2) - 100) -#define HPUX_LEVEL_TO_SND_CARD_LEVEL(a) (((a)+200)/2) -void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a) -{ - struct audio_gain gain; - int error,mix_fd; - - g_return_if_fail(obj->mixdev_name!=NULL); - memset(&gain,0,sizeof(struct audio_gain)); - switch(way){ - case SND_CARD_LEVEL_GENERAL: - gain.cgain[0].monitor_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - gain.cgain[1].monitor_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - break; - case SND_CARD_LEVEL_INPUT: - gain.cgain[0].receive_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - gain.cgain[1].receive_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - break; - case SND_CARD_LEVEL_OUTPUT: - gain.cgain[0].transmit_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - gain.cgain[1].transmit_gain=SND_CARD_LEVEL_TO_HPUX_LEVEL(a); - break; - default: - g_warning("hpux_snd_card_set_level: unsupported command."); - return; - } - gain.channel_mask=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); - if (error<0){ - g_warning("hpux_snd_card_set_level: Could not set gains: %s",strerror(errno)); - } - close(mix_fd); -} - -gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way) -{ - struct audio_gain gain; - int p=0,mix_fd,error; - g_return_if_fail(obj->mixdev_name!=NULL); - - gain.channel_mask=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); - if (error<0){ - g_warning("hpux_snd_card_set_level: Could not get gains: %s",strerror(errno)); - } - close(mix_fd); - - switch(way){ - case SND_CARD_LEVEL_GENERAL: - p=gain.cgain[0].monitor_gain; - break; - case SND_CARD_LEVEL_INPUT: - p=gain.cgain[0].receive_gain; - break; - case SND_CARD_LEVEL_OUTPUT: - p=gain.cgain[0].transmit_gain; - break; - default: - g_warning("hpux_snd_card_get_level: unsupported command."); - return -1; - } - return HPUX_LEVEL_TO_SND_CARD_LEVEL(p); -} - -void hpux_snd_card_set_source(HpuxSndCard *obj,int source) -{ - gint p=0; - gint mix_fd; - gint error=0; - g_return_if_fail(obj->mixdev_name!=NULL); - - mix_fd=open("/dev/audio",O_WRONLY); - g_return_if_fail(mix_fd>0); - switch(source){ - case 'm': - error=ioctl(mix_fd,AUDIO_SET_INPUT,AUDIO_IN_MIKE); - break; - case 'l': - error=ioctl(mix_fd,AUDIO_SET_INPUT,AUDIO_IN_LINE); - break; - default: - g_warning("hpux_snd_card_set_source: unsupported source."); - } - close(mix_fd); -} - -MSFilter *hpux_snd_card_create_read_filter(HpuxSndCard *card) -{ - MSFilter *f=ms_oss_read_new(); - ms_oss_read_set_device(MS_OSS_READ(f),SND_CARD(card)->index); - return f; -} - -MSFilter *hpux_snd_card_create_write_filter(HpuxSndCard *card) -{ - MSFilter *f=ms_oss_write_new(); - ms_oss_write_set_device(MS_OSS_WRITE(f),SND_CARD(card)->index); - return f; -} - - -SndCard * hpux_snd_card_new(char *devname, char *mixdev_name) -{ - HpuxSndCard * obj= g_new0(HpuxSndCard,1); - SndCard *base= SND_CARD(obj); - snd_card_init(base); - obj->dev_name=g_strdup(devname); - obj->mixdev_name=g_strdup( mixdev_name); - base->card_name=g_strdup(devname); - base->_probe=(SndCardOpenFunc)hpux_snd_card_probe; - base->_open_r=(SndCardOpenFunc)hpux_snd_card_open; - base->_open_w=(SndCardOpenFunc)hpux_snd_card_open; - base->_can_read=(SndCardPollFunc)hpux_snd_card_can_read; - base->_read=(SndCardIOFunc)hpux_snd_card_read; - base->_write=(SndCardIOFunc)hpux_snd_card_write; - base->_close_r=(SndCardCloseFunc)hpux_snd_card_close; - base->_close_w=(SndCardCloseFunc)hpux_snd_card_close; - base->_set_rec_source=(SndCardMixerSetRecSourceFunc)hpux_snd_card_set_source; - base->_set_level=(SndCardMixerSetLevelFunc)hpux_snd_card_set_level; - base->_get_level=(SndCardMixerGetLevelFunc)hpux_snd_card_get_level; - base->_destroy=(SndCardDestroyFunc)hpux_snd_card_destroy; - base->_create_read_filter=(SndCardCreateFilterFunc)hpux_snd_card_create_read_filter; - base->_create_write_filter=(SndCardCreateFilterFunc)hpux_snd_card_create_write_filter; - return base; -} - -#endif 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..32619987 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 @@ -42,6 +42,4 @@ typedef struct _OssCard OssCard; SndCard * oss_card_new(char *devname, char *mixdev_name); -typedef OssCard HpuxSndCard; - #endif diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/sndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/sndcard.c index e6d3a548..9fc8db63 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/sndcard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/sndcard.c @@ -130,17 +130,6 @@ MSFilter * snd_card_create_write_filter(SndCard *obj) } -#ifdef HAVE_SYS_AUDIO_H -gint sys_audio_manager_init(SndCardManager *manager, gint index) -{ - /* this is a quick shortcut, as multiple soundcards on HPUX does not happen - very often... */ - manager->cards[index]=hpux_snd_card_new("/dev/audio","/dev/audio"); - return 1; -} - -#endif - #include "osscard.h" #include "alsacard.h" #include "jackcard.h" @@ -170,10 +159,6 @@ void snd_card_manager_init(SndCardManager *manager) index+=tmp; if (index>=MAX_SND_CARDS) return; #endif - #ifdef HAVE_SYS_AUDIO_H - tmp=sys_audio_manager_init(manager,index); - index+=tmp; - #endif } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/avprofile.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/avprofile.c index 8917e21b..ed9642dd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/avprofile.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/avprofile.c @@ -29,7 +29,7 @@ char offset0=0; This means that if you want to keep portability, payload types must be defined with their fields in the right order. */ -#if !defined(__hpux) && !defined(WIN32) +#if !defined(WIN32) #define TYPE(val) type: (val) #define CLOCK_RATE(val) clock_rate: (val) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c index 80e07682..af7f54e1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c @@ -94,15 +94,6 @@ void ortp_scheduler_init() static gboolean initialized=FALSE; if (initialized) return; initialized=TRUE; -#ifdef __hpux - /* on hpux, we must block sigalrm on the main process, because signal delivery - is ?random?, well, sometimes the SIGALRM goes to both the main thread and the - scheduler thread */ - sigset_t set; - sigemptyset(&set); - sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); -#endif /* __hpux */ if (!g_thread_supported()) g_thread_init(NULL); __ortp_scheduler=rtp_scheduler_new(); rtp_scheduler_start(__ortp_scheduler); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpport.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpport.h index 65e48530..0e3d0d33 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpport.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpport.h @@ -149,7 +149,6 @@ void g_log_set_handler(const gchar *domain, GLogLevelFlags levels, GLogFunc func #else /* not HAVE_GLIB */ -/* things that in glib, but should only be defined when we are not in the HPUX kernel. */ #include <stdlib.h> #include <pthread.h> #include <sched.h> @@ -227,17 +226,6 @@ static inline void g_thread_join(GThread *thread){ g_free(thread); } -static inline void g_thread_set_priority(GThread *thread,GThreadPriority prio){ - if (prio>G_THREAD_PRIORITY_NORMAL){ - /* this is unsupported on HPUX */ - /* - struct sched_param param; - param.sched_priority=1; - sched_setscheduler(*thread,SCHED_RR,¶m); - */ - } -} - #define g_mutex_lock(mutex) pthread_mutex_lock((mutex)) #define g_mutex_unlock(mutex) pthread_mutex_unlock((mutex)) #define g_mutex_free(mutex) pthread_mutex_destroy((mutex));g_free((mutex)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c index de6b2e7d..672d32d7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c @@ -382,7 +382,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) close_socket (session->rtp.socket); continue; } -#ifndef __hpux switch (res->ai_family) { case AF_INET: @@ -416,7 +415,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) } break; } -#endif break; } freeaddrinfo(res0); @@ -458,7 +456,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) close_socket (session->rtcp.socket); continue; } -#ifndef __hpux switch (res->ai_family) { case AF_INET: @@ -494,7 +491,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) } break; } -#endif break; } @@ -558,7 +554,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) close_socket (session->rtcp.socket); return -1; } -#ifndef __hpux if (IN_MULTICAST(ntohl(session->rtp.loc_addr.sin_addr.s_addr))) { struct ip_mreq mreq; @@ -576,7 +571,6 @@ rtp_session_set_local_addr (RtpSession * session, const gchar * addr, gint port) } } #endif -#endif /* set RTP socket options */ set_non_blocking_socket (session->rtp.socket); /* set RTCP socket options */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c index 17ff6748..a77824ab 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c @@ -127,7 +127,6 @@ gpointer rtp_scheduler_schedule(gpointer psched) g_mutex_lock(sched->lock); g_cond_signal(sched->unblock_select_cond); /* unblock the starting thread */ g_mutex_unlock(sched->lock); - g_thread_set_priority(sched->thread,G_THREAD_PRIORITY_HIGH); timer->timer_init(); while(sched->thread_running) { diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp index 6f69e3f8..624afc0d 100644 --- a/ktalkd/ktalkd/announce.cpp +++ b/ktalkd/ktalkd/announce.cpp @@ -34,11 +34,6 @@ /* Autoconf: */ #include <config.h> -// strange symbol for HP-UX. It should not hurt on other systems. -#ifndef notdef -#define notdef 1 -#endif - #include "includ.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/ktalkd/mail.local/mail.local.c b/ktalkd/mail.local/mail.local.c index 007c46b8..bd301ae9 100644 --- a/ktalkd/mail.local/mail.local.c +++ b/ktalkd/mail.local/mail.local.c @@ -88,7 +88,7 @@ static char copyright[] = /* * This is not intended to compile on System V derived systems - * such as Solaris or HP-UX, since they use a totally different + * such as Solaris, since they use a totally different * approach to mailboxes (essentially, they have a setgid program * rather than setuid, and they rely on the ability to "give away" * files to do their work). IT IS NOT A BUG that this doesn't |