Date: Tue, 29 Aug 2006 19:29:41 +0200 From: "Soeren Straarup" <xride@x12.dk> To: "FreeBSD gnats submit" <freebsd-ports-bugs@freebsd.org> Subject: new port Message-ID: <1156872581.1127@thurisaz>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Soeren Straarup
>Organization:
>Confidential: no
>Synopsis: new port
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 6.1-PRERELEASE i386
>Environment:
System: FreeBSD 6.1-PRERELEASE #1: Fri Mar 3 08:26:44 CET 2006
xride@thurisaz:/usr/src/sys/i386/compile/thurisaz
>Description:
new drm software radio
>How-To-Repeat:
>Fix:
--- dream.shar begins here ---
#!/bin/sh
# This is a shell archive (produced by GNU sharutils 4.3.81).
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
#
# Made on 2006-08-29 18:43 CEST by <xride@thurisaz>.
# Source directory was `/usr/home/xride/ports'.
#
# Existing files will *not* be overwritten unless `-c' is specified.
#
# This shar contains:
# length mode name
# ------ ---------- ------------------------------------------
# 5279 -rw-r--r-- dream/files/patch-Vector.h
# 14208 -rw-r--r-- dream/files/patch-Modul.h
# 5220 -rw-r--r-- dream/files/patch-Buffer.h
# 1153 -rw-r--r-- dream/Makefile
# 91 -rw-r--r-- dream/distinfo
# 234 -rw-r--r-- dream/pkg-descr
# 8 -rw-r--r-- dream/pkg-plist
#
save_IFS="${IFS}"
IFS="${IFS}:"
gettext_dir=FAILED
locale_dir=FAILED
first_param="$1"
for dir in $PATH
do
if test "$gettext_dir" = FAILED && test -f $dir/gettext \
&& ($dir/gettext --version >/dev/null 2>&1)
then
case `$dir/gettext --version 2>&1 | sed 1q` in
*GNU*) gettext_dir=$dir ;;
esac
fi
if test "$locale_dir" = FAILED && test -f $dir/shar \
&& ($dir/shar --print-text-domain-dir >/dev/null 2>&1)
then
locale_dir=`$dir/shar --print-text-domain-dir`
fi
done
IFS="$save_IFS"
if test "$locale_dir" = FAILED || test "$gettext_dir" = FAILED
then
echo=echo
else
TEXTDOMAINDIR=$locale_dir
export TEXTDOMAINDIR
TEXTDOMAIN=sharutils
export TEXTDOMAIN
echo="$gettext_dir/gettext -s"
fi
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
shar_n= shar_c='
'
else
shar_n=-n shar_c=
fi
else
shar_n= shar_c='\c'
fi
if touch -am -t 200112312359.59 $$.touch >/dev/null 2>&1 && test ! -f 200112312359.59 && test -f $$.touch; then
shar_touch='touch -am -t $1$2$3$4$5$6.$7 "$8"'
elif touch -am 123123592001.59 $$.touch >/dev/null 2>&1 && test ! -f 123123592001.59 && test ! -f 123123592001.5 && test -f $$.touch; then
shar_touch='touch -am $3$4$5$6$1$2.$7 "$8"'
elif touch -am 1231235901 $$.touch >/dev/null 2>&1 && test ! -f 1231235901 && test -f $$.touch; then
shar_touch='touch -am $3$4$5$6$2 "$8"'
else
shar_touch=:
echo
$echo 'WARNING: not restoring timestamps. Consider getting and'
$echo "installing GNU \`touch', distributed in GNU File Utilities..."
echo
fi
rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
#
$echo $shar_n 'x -' 'lock directory' "\`_sh00997': "$shar_c
if mkdir _sh00997; then
$echo 'created'
else
$echo 'failed to create'
exit 1
fi
# ============= dream/files/patch-Vector.h ==============
if test ! -d 'dream'; then
$echo $echo_n 'x -' 'dream: '$echo_c
if mkdir 'dream'; then $echo 'created'; else $echo 'failed to create'; fi
fi
if test ! -d 'dream/files'; then
$echo $echo_n 'x -' 'dream/files: '$echo_c
if mkdir 'dream/files'; then $echo 'created'; else $echo 'failed to create'; fi
fi
if test -f 'dream/files/patch-Vector.h' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/files/patch-Vector.h' '(file already exists)'
else
$echo 'x -' extracting 'dream/files/patch-Vector.h' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/files/patch-Vector.h' &&
===================================================================
RCS file: /cvsroot/drm/drm/common/util/Vector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common/util/Vector.h 2005/06/29 21:21:25 1.2
+++ common/util/Vector.h 2005/09/08 16:22:18 1.3
@@ -39,7 +39,7 @@
X template<class TData> class CVector : public vector<TData>
X {
X public:
- CVector() : pData(begin()), iBitArrayCounter(0), iVectorSize(0) {}
+ CVector() : iBitArrayCounter(0), iVectorSize(0) {pData = this->begin();}
X CVector(const int iNeSi) {Init(iNeSi);}
X CVector(const int iNeSi, const TData tInVa) {Init(iNeSi, tInVa);}
X virtual ~CVector() {}
@@ -49,8 +49,8 @@
X pointer must be set to the new data source. The bit access is, by
X default, reset */
X CVector(const CVector<TData>& vecI) :
- vector<TData>(static_cast<const vector<TData>&>(vecI)),
- iVectorSize(vecI.Size()), pData(begin()), iBitArrayCounter(0) {}
+ vector<TData>(static_cast<const vector<TData>&>(vecI)),
+ iVectorSize(vecI.Size()), iBitArrayCounter(0) {pData = this->begin();}
X
X virtual void Init(const int iNewSize);
X
@@ -87,7 +87,7 @@
X
X inline CVector<TData>& operator=(const CVector<TData>& vecI) {
X #ifdef _DEBUG_
- /* Vectors which shall be copied MUST have same size! (If this is
+ /* Vectors which shall be copied MUST have same size! (If this is
X satisfied, the parameter "iVectorSize" must not be adjusted as
X a side effect) */
X if (vecI.Size() != iVectorSize)
@@ -100,7 +100,7 @@
X
X /* Reset my data pointer in case, the operator=() of the base class
X did change the actual memory */
- pData = begin();
+ pData = this->begin();
X
X return *this;
X }
@@ -125,9 +125,9 @@
X
X /* Clear old buffer and reserve memory for new buffer, get iterator
X for pointer operations */
- clear();
- resize(iNewSize);
- pData = begin();
+ this->clear();
+ this->resize(iNewSize);
+ pData = this->begin();
X }
X
X template<class TData> void CVector<TData>::Init(const int iNewSize,
@@ -143,11 +143,11 @@
X template<class TData> void CVector<TData>::Enlarge(const int iAddedSize)
X {
X iVectorSize += iAddedSize;
- resize(iVectorSize);
+ this->resize(iVectorSize);
X
X /* We have to reset the pointer since it could be that the vector size was
X zero before enlarging the vector */
- pData = begin();
+ pData = this->begin();
X }
X
X template<class TData> void CVector<TData>::Reset(const TData tResetVal)
@@ -224,21 +224,21 @@
X template<class TData> void CShiftRegister<TData>::AddBegin(const TData tNewD)
X {
X /* Shift old values */
- for (int i = iVectorSize - 1; i > 0; i--)
- pData[i] = pData[i - 1];
+ for (int i = this->iVectorSize - 1; i > 0; i--)
+ this->pData[i] = this->pData[i - 1];
X
X /* Add new value */
- pData[0] = tNewD;
+ this->pData[0] = tNewD;
X }
X
X template<class TData> void CShiftRegister<TData>::AddEnd(const TData tNewD)
X {
X /* Shift old values */
- for (int i = 0; i < iVectorSize - 1; i++)
- pData[i] = pData[i + 1];
+ for (int i = 0; i < this->iVectorSize - 1; i++)
+ this->pData[i] = this->pData[i + 1];
X
X /* Add new value */
- pData[iVectorSize - 1] = tNewD;
+ this->pData[this->iVectorSize - 1] = tNewD;
X }
X
X template<class TData> void CShiftRegister<TData>::AddEnd(const CVector<TData>& vectNewD,
@@ -246,16 +246,16 @@
X {
X int i, iBlockEnd, iMovLen;
X
- iBlockEnd = iVectorSize - iLen;
+ iBlockEnd = this->iVectorSize - iLen;
X iMovLen = iLen;
X
X /* Shift old values */
X for (i = 0; i < iBlockEnd; i++)
- pData[i] = pData[iMovLen++];
+ this->pData[i] = this->pData[iMovLen++];
X
X /* Add new block of data */
X for (i = 0; i < iLen; i++)
- pData[iBlockEnd++] = vectNewD[i];
+ this->pData[iBlockEnd++] = vectNewD[i];
X }
X
X
@@ -271,7 +271,7 @@
X CVector<TData>(iNeSi, tInVa), iCurIdx(0) {}
X
X void Add(const TData tNewD);
- inline TData Get() {return pData[iCurIdx];}
+ inline TData Get() {return this->pData[iCurIdx];}
X
X virtual void Init(const int iNewSize);
X virtual void Init(const int iNewSize, const TData tIniVal);
@@ -295,11 +295,11 @@
X
X template<class TData> void CFIFO<TData>::Add(const TData tNewD)
X {
- pData[iCurIdx] = tNewD;
+ this->pData[iCurIdx] = tNewD;
X
X /* Increment index */
X iCurIdx++;
- if (iCurIdx >= iVectorSize)
+ if (iCurIdx >= this->iVectorSize)
X iCurIdx = 0;
X }
X
@@ -334,7 +334,7 @@
X
X /* Init each vector in vector */
X for (int i = 0; i < iNewSize; i++)
- pData[i].Init(iNewVecSize, 0);
+ this->pData[i].Init(iNewVecSize, 0);
X
X /* Init current average result */
X tCurAvResult.Init(iNewVecSize, 0);
@@ -355,15 +355,15 @@
X history buffer
X */
X /* Subtract oldest value */
- tCurAvResult -= pData[iCurIdx];
+ tCurAvResult -= this->pData[iCurIdx];
X
X /* Add new value and write in memory */
X tCurAvResult += tNewD;
- pData[iCurIdx] = tNewD;
+ this->pData[iCurIdx] = tNewD;
X
X /* Increase position pointer and test if wrap */
X iCurIdx++;
- if (iCurIdx >= iVectorSize)
+ if (iCurIdx >= this->iVectorSize)
X iCurIdx = 0;
X }
X
@@ -381,7 +381,7 @@
X /* This flag indicates that the symbol ID has changed */
X _BOOLEAN bSymbolIDHasChanged;
X
- /* The channel estimation needs information about timing corrections,
+ /* The channel estimation needs information about timing corrections,
X because it is using information from the symbol memory */
X int iCurTimeCorr;
X };
SHAR_EOF
(set 20 06 08 26 20 17 07 'dream/files/patch-Vector.h'; eval "$shar_touch") &&
chmod 0644 'dream/files/patch-Vector.h' ||
$echo 'restore of' 'dream/files/patch-Vector.h' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/files/patch-Vector.h:' 'MD5 check failed'
1429a60059ee32b649b28043f60af3c3 dream/files/patch-Vector.h
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/files/patch-Vector.h'`"
test 5279 -eq "$shar_count" ||
$echo 'dream/files/patch-Vector.h:' 'original size' '5279,' 'current size' "$shar_count!"
fi
fi
# ============= dream/files/patch-Modul.h ==============
if test ! -d 'dream/files'; then
$echo $echo_n 'x -' 'dream/files: '$echo_c
if mkdir 'dream/files'; then $echo 'created'; else $echo 'failed to create'; fi
fi
if test -f 'dream/files/patch-Modul.h' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/files/patch-Modul.h' '(file already exists)'
else
$echo 'x -' extracting 'dream/files/patch-Modul.h' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/files/patch-Modul.h' &&
===================================================================
RCS file: /cvsroot/drm/drm/common/util/Modul.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common/util/Modul.h 2005/05/18 07:50:28 1.1
+++ common/util/Modul.h 2005/09/08 16:22:18 1.2
@@ -217,7 +217,7 @@
X
X /* Implementation *************************************************************/
X /******************************************************************************\
-* CModul *
+* CModul *
X \******************************************************************************/
X template<class TInput, class TOutput>
X CModul<TInput, TOutput>::CModul()
@@ -302,7 +302,7 @@
X
X
X /******************************************************************************\
-* Transmitter modul (CTransmitterModul) *
+* Transmitter modul (CTransmitterModul) *
X \******************************************************************************/
X template<class TInput, class TOutput>
X CTransmitterModul<TInput, TOutput>::CTransmitterModul()
@@ -347,7 +347,7 @@
X if (OutputBuffer.GetRequestFlag() == TRUE)
X {
X /* Check, if enough input data is available */
- if (InputBuffer.GetFillLevel() < iInputBlockSize)
+ if (InputBuffer.GetFillLevel() < this->iInputBlockSize)
X {
X /* Set request flag */
X InputBuffer.SetRequestFlag(TRUE);
@@ -356,19 +356,20 @@
X }
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Copy extended data from vectors */
- (*pvecOutputData).SetExData((*pvecInputData).GetExData());
+ (*(this->pvecOutputData)).
+ SetExData((*(this->pvecInputData)).GetExData());
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X
X /* Data was provided, clear data request */
X OutputBuffer.SetRequestFlag(FALSE);
@@ -389,7 +390,7 @@
X if (OutputBuffer.GetRequestFlag() == TRUE)
X {
X /* Check, if enough input data is available from all sources */
- if (InputBuffer.GetFillLevel() < iInputBlockSize)
+ if (InputBuffer.GetFillLevel() < this->iInputBlockSize)
X {
X /* Set request flag */
X InputBuffer.SetRequestFlag(TRUE);
@@ -412,18 +413,18 @@
X }
X
X /* Get vectors from transfer-buffers */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X pvecInputData2 = InputBuffer2.Get(iInputBlockSize2);
X pvecInputData3 = InputBuffer3.Get(iInputBlockSize3);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X
X /* Data was provided, clear data request */
X OutputBuffer.SetRequestFlag(FALSE);
@@ -440,13 +441,13 @@
X {
X /* Read data and write it in the transfer-buffer.
X Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X
X /* Data was provided, clear data request */
X OutputBuffer.SetRequestFlag(FALSE);
@@ -459,7 +460,7 @@
X {
X /* OUTPUT-DRIVEN modul implementation in the transmitter */
X /* Check, if enough input data is available */
- if (InputBuffer.GetFillLevel() < iInputBlockSize)
+ if (InputBuffer.GetFillLevel() < this->iInputBlockSize)
X {
X /* Set request flag */
X InputBuffer.SetRequestFlag(TRUE);
@@ -468,17 +469,17 @@
X }
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X return TRUE;
X }
X
X
X /******************************************************************************\
-* Receiver modul (CReceiverModul) *
+* Receiver modul (CReceiverModul) *
X \******************************************************************************/
X template<class TInput, class TOutput>
X CReceiverModul<TInput, TOutput>::CReceiverModul()
@@ -593,7 +594,7 @@
X }
X
X /* Special case if input block size is zero */
- if (iInputBlockSize == 0)
+ if (this->iInputBlockSize == 0)
X {
X InputBuffer.Clear();
X
@@ -605,21 +606,22 @@
X _BOOLEAN bEnoughData = FALSE;
X
X /* Check if enough data is available in the input buffer for processing */
- if (InputBuffer.GetFillLevel() >= iInputBlockSize)
+ if (InputBuffer.GetFillLevel() >= this->iInputBlockSize)
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Copy extended data from vectors */
- (*pvecOutputData).SetExData((*pvecInputData).GetExData());
+ (*(this->pvecOutputData)).
+ SetExData((*(this->pvecInputData)).GetExData());
X
X /* Call the underlying processing-routine */
- ProcessDataThreadSave(Parameter);
+ this->ProcessDataThreadSave(Parameter);
X
X /* Reset output-buffers if flag was set by processing routine */
X if (bResetBuf == TRUE)
@@ -631,7 +633,7 @@
X else
X {
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X }
X
@@ -662,19 +664,19 @@
X
X /* INPUT-DRIVEN modul implementation in the receiver -------------------- */
X /* Check if enough data is available in the input buffer for processing */
- if (InputBuffer.GetFillLevel() >= iInputBlockSize)
+ if (InputBuffer.GetFillLevel() >= this->iInputBlockSize)
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X pvecOutputData2 = OutputBuffer2.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataThreadSave(Parameter);
+ this->ProcessDataThreadSave(Parameter);
X
X /* Reset output-buffers if flag was set by processing routine */
X if (bResetBuf == TRUE)
@@ -686,7 +688,7 @@
X else
X {
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X
X if (bResetBuf2 == TRUE)
@@ -730,20 +732,20 @@
X
X /* INPUT-DRIVEN modul implementation in the receiver -------------------- */
X /* Check if enough data is available in the input buffer for processing */
- if (InputBuffer.GetFillLevel() >= iInputBlockSize)
+ if (InputBuffer.GetFillLevel() >= this->iInputBlockSize)
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X pvecOutputData2 = OutputBuffer2.QueryWriteBuffer();
X pvecOutputData3 = OutputBuffer3.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataThreadSave(Parameter);
+ this->ProcessDataThreadSave(Parameter);
X
X /* Reset output-buffers if flag was set by processing routine */
X if (bResetBuf == TRUE)
@@ -755,7 +757,7 @@
X else
X {
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X
X if (bResetBuf2 == TRUE)
@@ -805,10 +807,10 @@
X
X /* INPUT-DRIVEN modul implementation in the receiver -------------------- */
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataThreadSave(Parameter);
+ this->ProcessDataThreadSave(Parameter);
X
X /* Reset output-buffers if flag was set by processing routine */
X if (bResetBuf == TRUE)
@@ -820,7 +822,7 @@
X else
X {
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X }
X
@@ -842,7 +844,7 @@
X }
X
X /* Special case if input block size is zero and buffer, too */
- if ((InputBuffer.GetFillLevel() == 0) && (iInputBlockSize == 0))
+ if ((InputBuffer.GetFillLevel() == 0) && (this->iInputBlockSize == 0))
X {
X InputBuffer.Clear();
X return FALSE;
@@ -853,15 +855,15 @@
X _BOOLEAN bEnoughData = FALSE;
X
X /* Check if enough data is available in the input buffer for processing */
- if (InputBuffer.GetFillLevel() >= iInputBlockSize)
+ if (InputBuffer.GetFillLevel() >= this->iInputBlockSize)
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Call the underlying processing-routine */
- ProcessDataThreadSave(Parameter);
+ this->ProcessDataThreadSave(Parameter);
X }
X
X return bEnoughData;
@@ -869,7 +871,7 @@
X
X
X /******************************************************************************\
-* Simulation modul (CSimulationModul) *
+* Simulation modul (CSimulationModul) *
X \******************************************************************************/
X template<class TInput, class TOutput, class TInOut2>
X CSimulationModul<TInput, TOutput, TInOut2>::CSimulationModul()
@@ -929,7 +931,7 @@
X {
X /* TransferData needed for simulation */
X /* Check, if enough input data is available */
- if (InputBuffer.GetFillLevel() < iInputBlockSize)
+ if (InputBuffer.GetFillLevel() < this->iInputBlockSize)
X {
X /* Set request flag */
X InputBuffer.SetRequestFlag(TRUE);
@@ -938,16 +940,16 @@
X }
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X
X template<class TInput, class TOutput, class TInOut2>
@@ -961,26 +963,27 @@
X _BOOLEAN bEnoughData = FALSE;
X
X /* Check if enough data is available in the input buffer for processing */
- if ((InputBuffer.GetFillLevel() >= iInputBlockSize) &&
+ if ((InputBuffer.GetFillLevel() >= this->iInputBlockSize) &&
X (InputBuffer2.GetFillLevel() >= iInputBlockSize2))
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X pvecInputData2 = InputBuffer2.Get(iInputBlockSize2);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X
X /* Copy extended data from FIRST input vector (definition!) */
- (*pvecOutputData).SetExData((*pvecInputData).GetExData());
+ (*(this->pvecOutputData)).
+ SetExData((*(this->pvecInputData)).GetExData());
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffer */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X }
X
X return bEnoughData;
@@ -997,22 +1000,22 @@
X _BOOLEAN bEnoughData = FALSE;
X
X /* Check if enough data is available in the input buffer for processing */
- if (InputBuffer.GetFillLevel() >= iInputBlockSize)
+ if (InputBuffer.GetFillLevel() >= this->iInputBlockSize)
X {
X bEnoughData = TRUE;
X
X /* Get vector from transfer-buffer */
- pvecInputData = InputBuffer.Get(iInputBlockSize);
+ this->pvecInputData = InputBuffer.Get(this->iInputBlockSize);
X
X /* Query vector from output transfer-buffer for writing */
- pvecOutputData = OutputBuffer.QueryWriteBuffer();
+ this->pvecOutputData = OutputBuffer.QueryWriteBuffer();
X pvecOutputData2 = OutputBuffer2.QueryWriteBuffer();
X
X /* Call the underlying processing-routine */
- ProcessDataInternal(Parameter);
+ this->ProcessDataInternal(Parameter);
X
X /* Write processed data from internal memory in transfer-buffers */
- OutputBuffer.Put(iOutputBlockSize);
+ OutputBuffer.Put(this->iOutputBlockSize);
X OutputBuffer2.Put(iOutputBlockSize2);
X }
X
SHAR_EOF
(set 20 06 08 26 20 17 08 'dream/files/patch-Modul.h'; eval "$shar_touch") &&
chmod 0644 'dream/files/patch-Modul.h' ||
$echo 'restore of' 'dream/files/patch-Modul.h' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/files/patch-Modul.h:' 'MD5 check failed'
c3f1abf06de9842dcfb7841e69949e6d dream/files/patch-Modul.h
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/files/patch-Modul.h'`"
test 14208 -eq "$shar_count" ||
$echo 'dream/files/patch-Modul.h:' 'original size' '14208,' 'current size' "$shar_count!"
fi
fi
# ============= dream/files/patch-Buffer.h ==============
if test -f 'dream/files/patch-Buffer.h' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/files/patch-Buffer.h' '(file already exists)'
else
$echo 'x -' extracting 'dream/files/patch-Buffer.h' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/files/patch-Buffer.h' &&
===================================================================
RCS file: /cvsroot/drm/drm/common/util/Buffer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common/util/Buffer.h 2005/05/18 07:50:28 1.1
+++ common/util/Buffer.h 2005/09/08 16:22:18 1.2
@@ -71,7 +71,7 @@
X
X virtual void Init(const int iNewBufferSize);
X virtual CVectorEx<TData>* Get(const int iRequestedSize);
- virtual CVectorEx<TData>* QueryWriteBuffer() {return &vecBuffer;}
+ virtual CVectorEx<TData>* QueryWriteBuffer() {return &(this->vecBuffer);}
X virtual void Put(const int iOfferedSize);
X virtual void Clear() {iFillLevel = 0;}
X virtual int GetFillLevel() const {return iFillLevel;}
@@ -123,7 +123,7 @@
X template<class TData> void CSingleBuffer<TData>::Init(const int iNewBufferSize)
X {
X /* Only initialize buffer when size has changed, otherwise preserve data */
- if (iNewBufferSize != iBufferSize)
+ if (iNewBufferSize != this->iBufferSize)
X {
X CBuffer<TData>::Init(iNewBufferSize);
X
@@ -146,7 +146,7 @@
X /* Block is read, buffer is now empty again */
X iFillLevel -= iRequestedSize;
X
- return &vecBuffer;
+ return &(this->vecBuffer);
X }
X
X template<class TData> void CSingleBuffer<TData>::Put(const int iOfferedSize)
@@ -170,7 +170,7 @@
X template<class TData> void CCyclicBuffer<TData>::Init(const int iNewBufferSize)
X {
X /* Only initialize buffer when size has changed, otherwise preserve data */
- if (iNewBufferSize != iBufferSize)
+ if (iNewBufferSize != this->iBufferSize)
X {
X CBuffer<TData>::Init(iNewBufferSize);
X
@@ -191,7 +191,7 @@
X iPut = 0;
X iGet = 0;
X iBufferState = BS_EMPTY;
- bRequestFlag = FALSE;
+ this->bRequestFlag = FALSE;
X }
X
X template<class TData> CVectorEx<TData>* CCyclicBuffer<TData>::Get(const int iRequestedSize)
@@ -204,7 +204,7 @@
X iAvailSpace = iPut - iGet;
X /* Test if wrap is needed */
X if ((iAvailSpace < 0) || ((iAvailSpace == 0) && (iBufferState == BS_FULL)))
- iAvailSpace += iBufferSize;
+ iAvailSpace += this->iBufferSize;
X
X #ifdef _DEBUG_
X if (iAvailSpace < iRequestedSize)
@@ -219,17 +219,17 @@
X iElementCount = 0;
X
X /* Test if data can be read in one block */
- if (iBufferSize - iGet < iRequestedSize)
+ if (this->iBufferSize - iGet < iRequestedSize)
X {
X /* Data must be read in two portions */
- for (i = iGet; i < iBufferSize; i++)
+ for (i = iGet; i < this->iBufferSize; i++)
X {
- vecInOutBuffer[iElementCount] = vecBuffer[i];
+ vecInOutBuffer[iElementCount] = this->vecBuffer[i];
X iElementCount++;
X }
- for (i = 0; i < iRequestedSize - iBufferSize + iGet; i++)
+ for (i = 0; i < iRequestedSize - this->iBufferSize + iGet; i++)
X {
- vecInOutBuffer[iElementCount] = vecBuffer[i];
+ vecInOutBuffer[iElementCount] = this->vecBuffer[i];
X iElementCount++;
X }
X }
@@ -238,15 +238,15 @@
X /* Data can be read in one block */
X for (i = iGet; i < iGet + iRequestedSize; i++)
X {
- vecInOutBuffer[iElementCount] = vecBuffer[i];
+ vecInOutBuffer[iElementCount] = this->vecBuffer[i];
X iElementCount++;
X }
X }
X
X /* Adjust iGet pointer */
X iGet += iRequestedSize;
- if (iGet >= iBufferSize)
- iGet -= iBufferSize;
+ if (iGet >= this->iBufferSize)
+ iGet -= this->iBufferSize;
X
X /* Test if buffer is empty. If yes, set empty-flag */
X if ((iGet == iPut) && (iRequestedSize > 0))
@@ -265,7 +265,7 @@
X iAvailSpace = iGet - iPut;
X /* Test if wrap is needed */
X if ((iAvailSpace < 0) || ((iAvailSpace == 0) && (iBufferState == BS_EMPTY)))
- iAvailSpace += iBufferSize;
+ iAvailSpace += this->iBufferSize;
X
X #ifdef _DEBUG_
X if (iAvailSpace < iOfferedSize)
@@ -280,17 +280,17 @@
X iElementCount = 0;
X
X /* Test if data can be written in one block */
- if (iBufferSize - iPut < iOfferedSize)
+ if (this->iBufferSize - iPut < iOfferedSize)
X {
X /* Data must be written in two steps */
- for (i = iPut; i < iBufferSize; i++)
+ for (i = iPut; i < this->iBufferSize; i++)
X {
- vecBuffer[i] = vecInOutBuffer[iElementCount];
+ this->vecBuffer[i] = vecInOutBuffer[iElementCount];
X iElementCount++;
X }
- for (i = 0; i < iOfferedSize - iBufferSize + iPut; i++)
+ for (i = 0; i < iOfferedSize - this->iBufferSize + iPut; i++)
X {
- vecBuffer[i] = vecInOutBuffer[iElementCount];
+ this->vecBuffer[i] = vecInOutBuffer[iElementCount];
X iElementCount++;
X }
X }
@@ -299,15 +299,15 @@
X /* Data can be written in one block */
X for (i = iPut; i < iPut + iOfferedSize; i++)
X {
- vecBuffer[i] = vecInOutBuffer[iElementCount];
+ this->vecBuffer[i] = vecInOutBuffer[iElementCount];
X iElementCount++;
X }
X }
X
X /* Adjust iPut pointer */
X iPut += iOfferedSize;
- if (iPut >= iBufferSize)
- iPut -= iBufferSize;
+ if (iPut >= this->iBufferSize)
+ iPut -= this->iBufferSize;
X
X /* Test if buffer is full. If yes, set full-flag */
X if ((iGet == iPut) && (iOfferedSize > 0))
@@ -322,9 +322,9 @@
X Take into account the flag-information (full or empty buffer) */
X iFillLevel = iPut - iGet;
X if ((iFillLevel == 0) && (iBufferState == BS_FULL))
- iFillLevel = iBufferSize;
+ iFillLevel = this->iBufferSize;
X if (iFillLevel < 0)
- iFillLevel += iBufferSize; /* Wrap around */
+ iFillLevel += this->iBufferSize; /* Wrap around */
X
X return iFillLevel;
X }
SHAR_EOF
(set 20 06 08 26 20 17 08 'dream/files/patch-Buffer.h'; eval "$shar_touch") &&
chmod 0644 'dream/files/patch-Buffer.h' ||
$echo 'restore of' 'dream/files/patch-Buffer.h' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/files/patch-Buffer.h:' 'MD5 check failed'
17987b67dd97e5f75c28eeaab13a3e07 dream/files/patch-Buffer.h
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/files/patch-Buffer.h'`"
test 5220 -eq "$shar_count" ||
$echo 'dream/files/patch-Buffer.h:' 'original size' '5220,' 'current size' "$shar_count!"
fi
fi
# ============= dream/Makefile ==============
if test -f 'dream/Makefile' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/Makefile' '(file already exists)'
else
$echo 'x -' extracting 'dream/Makefile' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/Makefile' &&
# New ports collection makefile for: Dream DRM Receiver
# Date created: 29th of August 2006
# Whom: Soeren Straarup <xride@x12.dk>
#
# $FreeBSD$
X
PORTNAME= dream
PORTVERSION= 1.2.4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= drm
DISTNAME= drm-${PORTVERSION}
X
MAINTAINER= xride@x12.dk
COMMENT= Digital Radio Mondiale (DRM) software receiver
X
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
X qwt.4:${PORTSDIR}/x11-toolkits/qwt \
X faad.0:${PORTSDIR}/audio/faad
X
USE_X_PREFIX= yes
USE_QT_VER= 3
GNU_CONFIGURE= yes
CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" QTDIR="${QT_PREFIX}"
USE_REINPLACE= yes
X
post-patch:
X @${REINPLACE_CMD} -e 's|/usr/include/qwt|${LOCALBASE}/include/qwt|g' ${WRKSRC}/configure
X @${REINPLACE_CMD} -e 's|<linux/soundcard.h>|<sys/soundcard.h>|g' ${WRKSRC}/linux/source/sound.cpp
X @${REINPLACE_CMD} -e 's|neaacdec.h|faad.h|g' ${WRKSRC}/common/sourcedecoders/AudioSourceDecoder.cpp
X @${REINPLACE_CMD} -e 's|DRMCH_SBR_PS_STEREO|DRMCH_SBR_STEREO|g' ${WRKSRC}/common/sourcedecoders/AudioSourceDecoder.cpp
X
X.include <bsd.port.mk>
SHAR_EOF
(set 20 06 08 29 18 37 53 'dream/Makefile'; eval "$shar_touch") &&
chmod 0644 'dream/Makefile' ||
$echo 'restore of' 'dream/Makefile' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/Makefile:' 'MD5 check failed'
9b5d5e87d507cde138d0887f61960ee2 dream/Makefile
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/Makefile'`"
test 1153 -eq "$shar_count" ||
$echo 'dream/Makefile:' 'original size' '1153,' 'current size' "$shar_count!"
fi
fi
# ============= dream/distinfo ==============
if test -f 'dream/distinfo' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/distinfo' '(file already exists)'
else
$echo 'x -' extracting 'dream/distinfo' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/distinfo' &&
MD5 (drm-1.2.4.tar.gz) = 55b219cc30b0999ebf66c458b74fe2f2
SIZE (drm-1.2.4.tar.gz) = 686118
SHAR_EOF
(set 20 06 08 26 20 17 08 'dream/distinfo'; eval "$shar_touch") &&
chmod 0644 'dream/distinfo' ||
$echo 'restore of' 'dream/distinfo' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/distinfo:' 'MD5 check failed'
d2d6bcae8772637108d0c007b3467332 dream/distinfo
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/distinfo'`"
test 91 -eq "$shar_count" ||
$echo 'dream/distinfo:' 'original size' '91,' 'current size' "$shar_count!"
fi
fi
# ============= dream/pkg-descr ==============
if test -f 'dream/pkg-descr' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/pkg-descr' '(file already exists)'
else
$echo 'x -' extracting 'dream/pkg-descr' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/pkg-descr' &&
X Dream is a software implementation of a Digital Radio Mondiale (DRM) receiver. All you need to receive DRM transmissions is a PC with a sound card and a modified analog short-wave (MW, LW) receiver.
X
WWW: http://drm.sourceforge.net/
SHAR_EOF
(set 20 06 08 26 20 17 08 'dream/pkg-descr'; eval "$shar_touch") &&
chmod 0644 'dream/pkg-descr' ||
$echo 'restore of' 'dream/pkg-descr' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/pkg-descr:' 'MD5 check failed'
3b4035b9fb5ae84677d58cb3b037cb4e dream/pkg-descr
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/pkg-descr'`"
test 234 -eq "$shar_count" ||
$echo 'dream/pkg-descr:' 'original size' '234,' 'current size' "$shar_count!"
fi
fi
# ============= dream/pkg-plist ==============
if test -f 'dream/pkg-plist' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'dream/pkg-plist' '(file already exists)'
else
$echo 'x -' extracting 'dream/pkg-plist' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'dream/pkg-plist' &&
bin/drm
SHAR_EOF
(set 20 06 08 26 20 17 08 'dream/pkg-plist'; eval "$shar_touch") &&
chmod 0644 'dream/pkg-plist' ||
$echo 'restore of' 'dream/pkg-plist' 'failed'
if ( md5sum --help </dev/null 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version </dev/null 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'dream/pkg-plist:' 'MD5 check failed'
55e139bdba6ed03c34ac0712899d0ddc dream/pkg-plist
SHAR_EOF
else
shar_count="`LC_ALL=C wc -c < 'dream/pkg-plist'`"
test 8 -eq "$shar_count" ||
$echo 'dream/pkg-plist:' 'original size' '8,' 'current size' "$shar_count!"
fi
fi
$echo $shar_n 'x -' 'lock directory' "\`_sh00997': " $shar_c
if rm -fr _sh00997; then
$echo 'removed'
else
$echo 'failed to remove'
fi
exit 0
--- dream.shar ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1156872581.1127>