gmfsk/gmfsk.patch

   1 diff --git a/src/misc/misc.c b/src/misc/misc.c
   2 index 14b1320..8bd3f59 100644
   3 --- a/src/misc/misc.c
   4 +++ b/src/misc/misc.c
   5 @@ -103,25 +103,6 @@ guint8 rbits8(guint8 w)
   6  /* ---------------------------------------------------------------------- */
   7
   8  /*
   9 - * Integer base-2 logarithm
  10 - */
  11 -guint log2(guint x)
  12 -{
  13 -       int y = 0;
  14 -
  15 -       x >>= 1;
  16 -
  17 -       while (x) {
  18 -               x >>= 1;
  19 -               y++;
  20 -       }
  21 -
  22 -       return y;
  23 -}
  24 -
  25 -/* ---------------------------------------------------------------------- */
  26 -
  27 -/*
  28   * Gray encoding and decoding (8 bit)
  29   */
  30  guint8 grayencode(guint8 data)
  31 diff --git a/src/misc/misc.h b/src/misc/misc.h
  32 index 083de73..6a9cf30 100644
  33 --- a/src/misc/misc.h
  34 +++ b/src/misc/misc.h
  35 @@ -105,25 +105,6 @@ extern inline guint8 rbits8(guint8 w)
  36  /* ---------------------------------------------------------------------- */
  37
  38  /*
  39 - * Integer base-2 logarithm
  40 - */
  41 -extern inline guint log2(guint x)
  42 -{
  43 -       int y = 0;
  44 -
  45 -       x >>= 1;
  46 -
  47 -       while (x) {
  48 -               x >>= 1;
  49 -               y++;
  50 -       }
  51 -
  52 -       return y;
  53 -}
  54 -
  55 -/* ---------------------------------------------------------------------- */
  56 -
  57 -/*
  58   * Gray encoding and decoding (8 bit)
  59   */
  60  extern inline guint8 grayencode(guint8 data)
  61 diff --git a/src/olivia/mfsk.h b/src/olivia/mfsk.h
  62 index 288bed3..4d5f28c 100644
  63 --- a/src/olivia/mfsk.h
  64 +++ b/src/olivia/mfsk.h
  65 @@ -1960,7 +1960,7 @@ template <class Type=float>
  66
  67     Type *ModulatorOutput;
  68
  69 -   RateConverter<Type> RateConverter; // output rate converter
  70 +   RateConverter<Type> xRateConverter; // output rate converter
  71
  72     Type *ConverterOutput;
  73
  74 @@ -1982,7 +1982,7 @@ template <class Type=float>
  75         Encoder.Free();
  76         Modulator.Free();
  77         free(ModulatorOutput); ModulatorOutput=0;
  78 -          RateConverter.Free();
  79 +          xRateConverter.Free();
  80         free(ConverterOutput); ConverterOutput=0; }
  81
  82     // set default primary parameters
  83 @@ -2027,8 +2027,8 @@ template <class Type=float>
  84         if(ReallocArray(&ModulatorOutput,Modulator.SymbolSepar)<0) goto Error;
  85
  86         // preset the rate converter
  87 -       RateConverter.OutputRate=OutputSampleRate/SampleRate;
  88 -          if(RateConverter.Preset()<0) goto Error;
  89 +       xRateConverter.OutputRate=OutputSampleRate/SampleRate;
  90 +          if(xRateConverter.Preset()<0) goto Error;
  91
  92         MaxOutputLen=(size_t)ceil(Modulator.SymbolSepar*OutputSampleRate/SampleRate+2);
  93         if(ReallocArray(&ConverterOutput,MaxOutputLen)<0) goto Error;
  94 @@ -2046,7 +2046,7 @@ template <class Type=float>
  95            Monitor.Reset();
  96         SymbolPtr=0;
  97         State=0;
  98 -          RateConverter.Reset(); }
  99 +          xRateConverter.Reset(); }
 100
 101     Type BaudRate(void)
 102     { return SampleRate/Modulator.SymbolSepar; }
 103 @@ -2102,7 +2102,7 @@ template <class Type=float>
 104            { Modulator.Send(Encoder.OutputBlock[SymbolPtr]);
 105           SymbolPtr+=1; if(SymbolPtr>=SymbolsPerBlock) SymbolPtr=0; }
 106         int ModLen=Modulator.Output(ModulatorOutput);
 107 -          int ConvLen=RateConverter.Process(ModulatorOutput,ModLen,ConverterOutput);
 108 +          int ConvLen=xRateConverter.Process(ModulatorOutput,ModLen,ConverterOutput);
 109         if(ConvLen<0) return ConvLen;
 110         ConvertToS16(ConverterOutput,Buffer,ConvLen);
 111            return ConvLen; }
 112 @@ -2209,7 +2209,7 @@ template <class Type=float>
 113
 114    private:
 115
 116 -   RateConverter<Type> RateConverter;
 117 +   RateConverter<Type> xRateConverter;
 118
 119     Seq<Type> InputBuffer;
 120
 121 @@ -2267,7 +2267,7 @@ template <class Type=float>
 122             DecodePipe[Idx].Free();
 123           free(DecodePipe); DecodePipe=0; }
 124
 125 -       RateConverter.Free();
 126 +       xRateConverter.Free();
 127         InputBuffer.Free();
 128         InputProcessor.Free();
 129         Demodulator.Free();
 130 @@ -2305,8 +2305,8 @@ template <class Type=float>
 131         BitsPerSymbol=Log2(Tones);
 132         Tones=Exp2(BitsPerSymbol);
 133
 134 -       RateConverter.OutputRate=SampleRate/InputSampleRate;
 135 -       if(RateConverter.Preset()<0) goto Error;
 136 +       xRateConverter.OutputRate=SampleRate/InputSampleRate;
 137 +       if(xRateConverter.Preset()<0) goto Error;
 138
 139         Demodulator.BitsPerSymbol=BitsPerSymbol;
 140         Demodulator.SymbolLen=Exp2(BitsPerSymbol+7-Log2(Bandwidth/125));
 141 @@ -2383,7 +2383,7 @@ template <class Type=float>
 142     void Reset(void)
 143       { size_t Idx;
 144
 145 -       RateConverter.Reset();
 146 +       xRateConverter.Reset();
 147
 148         InputBuffer.Clear();
 149
 150 @@ -2458,7 +2458,7 @@ template <class Type=float>
 151     // process an audio batch: first the input processor, then the demodulator
 152     template <class InpType>
 153      int Process(InpType *Input, size_t InputLen)
 154 -     { if(RateConverter.Process(Input, InputLen, InputBuffer)<0) return -1;
 155 +     { if(xRateConverter.Process(Input, InputLen, InputBuffer)<0) return -1;
 156         ProcessInputBuffer();
 157            return 0; }
 158