From 5941293003fa1c5f0635bcd4e98a858b2a6b737b Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 25 Dec 2016 21:45:09 +0000 Subject: Don't expect pointers to have a sign. --- ham/linpsk/distinfo | 10 +++++----- ham/linpsk/patches/patch-ac | 22 ++++++++++++++++++---- ham/linpsk/patches/patch-af | 20 +++++++++++++++++++- ham/linpsk/patches/patch-ai | 13 +++++++++---- ham/linpsk/patches/patch-src_csound.cpp | 13 +++++++++++-- 5 files changed, 62 insertions(+), 16 deletions(-) diff --git a/ham/linpsk/distinfo b/ham/linpsk/distinfo index ba400f48c46..99bbc04e858 100644 --- a/ham/linpsk/distinfo +++ b/ham/linpsk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2015/11/02 23:57:24 agc Exp $ +$NetBSD: distinfo,v 1.12 2016/12/25 21:45:09 joerg Exp $ SHA1 (linpsk-0.8.1.tar.gz) = d55d8c793ecd3a4395603ebdd8e795f1dc4d20f9 RMD160 (linpsk-0.8.1.tar.gz) = 975bbdfc0b63e516f1d5fdfe6baf10fa12899219 @@ -6,12 +6,12 @@ SHA512 (linpsk-0.8.1.tar.gz) = c2488b08d47b46225d38f9f1a2558b0deaa261c939f633fcd Size (linpsk-0.8.1.tar.gz) = 435463 bytes SHA1 (patch-aa) = ac3c504022d495c619056ad0e5fd7b8e9ff6f71c SHA1 (patch-ab) = 0cc21222e30d9122657e5c373b19af15c39eb883 -SHA1 (patch-ac) = 5be307963474f6879490185b47bed6e50dd51ffe +SHA1 (patch-ac) = 2cc23f7f42af6df2d3af0ba68713be013361efab SHA1 (patch-ad) = d9a62afada11b17730e4457e73fef7e21b8bee62 -SHA1 (patch-af) = 785bf818f14b1e733321a8e6cc0f998883cffe4a +SHA1 (patch-af) = 42d771ce553c28161d9b3150ccf27cf307c46a54 SHA1 (patch-ag) = 490d53c18ec1cb3961e7d49ec8f551c386bcec6a -SHA1 (patch-ai) = 192112a67a4ad8d70d4f71fbb1390a1fb26d7496 -SHA1 (patch-src_csound.cpp) = 38897d8b3b07bb3e05215a2b5d49f7aa1d02c451 +SHA1 (patch-ai) = 89f07e76e87929fff4d16ca23725168c4e4ce215 +SHA1 (patch-src_csound.cpp) = 83051275a23627adc242b46661c2d4f844558eee SHA1 (patch-src_csound.h) = 7d7d367ee152afc8bbf7cd3e8bf3179f1d911dcc SHA1 (patch-src_portaudio_pa__unix__oss.c) = eb3303ed554921d98c869c457172f7f346a7b850 SHA1 (patch-src_textinput.cpp) = e9a3881bad34d56da61881d23a7ee2b6cc52f6bb diff --git a/ham/linpsk/patches/patch-ac b/ham/linpsk/patches/patch-ac index e028f57fc6f..fa919690d21 100644 --- a/ham/linpsk/patches/patch-ac +++ b/ham/linpsk/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2005/08/15 14:03:53 wulf Exp $ +$NetBSD: patch-ac,v 1.3 2016/12/25 21:45:09 joerg Exp $ ---- src/crxdisplay.cpp.orig 2005-03-12 03:49:18.000000000 +1030 -+++ src/crxdisplay.cpp 2005-08-15 05:36:46.000000000 +0930 +--- src/crxdisplay.cpp.orig 2005-03-11 17:19:18.000000000 +0000 ++++ src/crxdisplay.cpp @@ -27,7 +27,7 @@ #include #include @@ -11,7 +11,12 @@ $NetBSD: patch-ac,v 1.2 2005/08/15 14:03:53 wulf Exp $ #include "crecording.h" #include "crxchannel.h" -@@ -68,7 +68,7 @@ +@@ -64,11 +64,11 @@ void MyTabBar::paintLabel ( QPainter *p, + flags |= QStyle::Style_HasFocus; + + QColorGroup Cg=colorGroup(); +- if (Farbe > 0) ++ if (Farbe) { int position=t->identifier(); if ( position >= 0 && position < Farbe->size() ) @@ -20,3 +25,12 @@ $NetBSD: patch-ac,v 1.2 2005/08/15 14:03:53 wulf Exp $ } style().drawControl( QStyle::CE_TabBarLabel, p, this, br, Cg, +@@ -236,7 +236,7 @@ if ( Sound == 0 ) + Sound = new CSound(settings.serial); + + } +-if ( Sound <= 0 ) ++if ( Sound == 0 ) + return false; + m_pDec2InPtr=dec2fir; + diff --git a/ham/linpsk/patches/patch-af b/ham/linpsk/patches/patch-af index f4de123b421..be9174ac840 100644 --- a/ham/linpsk/patches/patch-af +++ b/ham/linpsk/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2012/07/03 18:06:38 joerg Exp $ +$NetBSD: patch-af,v 1.4 2016/12/25 21:45:09 joerg Exp $ --- src/linpsk.cpp.orig 2005-03-11 17:21:20.000000000 +0000 +++ src/linpsk.cpp @@ -20,6 +20,24 @@ $NetBSD: patch-af,v 1.3 2012/07/03 18:06:38 joerg Exp $ settings.RxChannels++; RxDisplay->RxFreq->setAfcDisplayMode(settings.ActChannel->AfcProperties()); } +@@ -505,7 +507,7 @@ if ( Modulator != 0 ) + } + else + { +- if (Sound > 0) ++ if (Sound) + Sound->PTT(false); + if (RxDisplay->start_process_loop()) + { +@@ -602,7 +604,7 @@ if (settings.DemoMode) + else + Sound = new CSound(settings.serial); + +-if ( Sound <= 0 ) ++if ( Sound == 0 ) + { + QMessageBox::critical(0," Programm Error! LinPsk","Could not create Sound Device for Output"); + TxDisplay->TxFunctions->RXTX->setStatus(ON); @@ -781,7 +783,8 @@ if (Param != 0) RxDisplay->RxFreq->setAfcDisplayMode(settings.ActChannel->AfcProperties()); RxDisplay->RxFreq->setAfcMode(settings.ActChannel->getAfcMode()); diff --git a/ham/linpsk/patches/patch-ai b/ham/linpsk/patches/patch-ai index 4c0fc74b14b..fb7d50304ee 100644 --- a/ham/linpsk/patches/patch-ai +++ b/ham/linpsk/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.2 2005/08/15 14:03:53 wulf Exp $ +$NetBSD: patch-ai,v 1.3 2016/12/25 21:45:09 joerg Exp $ ---- src/spectrumdisplay.cpp.orig 2005-03-13 20:32:03.000000000 +1030 -+++ src/spectrumdisplay.cpp 2005-08-15 07:24:05.000000000 +0930 +--- src/spectrumdisplay.cpp.orig 2005-03-13 10:02:03.000000000 +0000 ++++ src/spectrumdisplay.cpp @@ -21,6 +21,8 @@ #include #include @@ -11,7 +11,12 @@ $NetBSD: patch-ai,v 1.2 2005/08/15 14:03:53 wulf Exp $ #include "spectrumdisplay.h" #include "crxchannel.h" #include "parameter.h" -@@ -178,7 +180,7 @@ +@@ -174,11 +176,11 @@ p.setBrush(white); + + for (CRxChannel *pRx=settings.ChannelChain;pRx != 0;pRx= pRx->getNextChannel()) + { +- if ( Farbe > 0) ++ if ( Farbe ) { int ID = pRx->getID(); if ( ID >= 0 && ID < Farbe->size() ) diff --git a/ham/linpsk/patches/patch-src_csound.cpp b/ham/linpsk/patches/patch-src_csound.cpp index 131bd8a422e..be71a255644 100644 --- a/ham/linpsk/patches/patch-src_csound.cpp +++ b/ham/linpsk/patches/patch-src_csound.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-src_csound.cpp,v 1.1 2013/03/02 18:06:22 joerg Exp $ +$NetBSD: patch-src_csound.cpp,v 1.2 2016/12/25 21:45:09 joerg Exp $ ---- src/csound.cpp.orig 2013-02-28 22:13:24.000000000 +0000 +--- src/csound.cpp.orig 2005-02-20 10:05:46.000000000 +0000 +++ src/csound.cpp @@ -81,7 +81,7 @@ return 0; @@ -11,3 +11,12 @@ $NetBSD: patch-src_csound.cpp,v 1.1 2013/03/02 18:06:22 joerg Exp $ { stream=0; audio_buffer.maxbuf=3*BUF_SIZE; // We take 3 buffers +@@ -92,7 +92,7 @@ output=false; + } + CSound::~CSound() + { +-if ( audio_buffer.audiobuffer >0) ++if ( audio_buffer.audiobuffer ) + delete audio_buffer.audiobuffer; + } + -- cgit v1.2.3