[MPlayer-cvslog] r18612 - in trunk: ChangeLog DOCS/man/cs/mplayer.1 DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 libaf/Makefile libaf/af.c libaf/af_sinesuppress.c libaf/control.h

[corey]

Author: corey
Date: Wed Jun  7 02:02:51 2006
New Revision: 18612

Added:
   trunk/libaf/af_sinesuppress.c
      - copied, changed from r18611, /trunk/libaf/af_sinesupress.c
Modified:
   trunk/ChangeLog
   trunk/libaf/Makefile
   trunk/libaf/af.c
   trunk/libaf/control.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/cs/mplayer.1
   trunk/DOCS/man/de/mplayer.1
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/man/fr/mplayer.1
   trunk/DOCS/man/hu/mplayer.1

Log:
Rename sinesupress to sinesuppress, including af_sinesupress.c file rename.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Wed Jun  7 02:02:51 2006
@@ -160,7 +160,7 @@
     * screenshot filter
     * -af pan command line fix, now outputs the right number of channels
       and accepts values < 0 or > 1. Channel order had to be changed.
-    * -af sinesupress to remove a sine at a certain frequency
+    * -af sinesuppress to remove a sine at a certain frequency
     * negative stride support in swscale
     * big-endian and AltiVec fixes and performance improvements for swscaler,
       color conversions and post-processing

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Wed Jun  7 02:02:51 2006
@@ -17,7 +17,7 @@
      af_karaoke.c \
      af_pan.c \
      af_resample.c \
-     af_sinesupress.c \
+     af_sinesuppress.c \
      af_sub.c \
      af_surround.c \
      af_sweep.c \

Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c	(original)
+++ trunk/libaf/af.c	Wed Jun  7 02:02:51 2006
@@ -29,7 +29,7 @@
 extern af_info_t af_info_hrtf;
 extern af_info_t af_info_ladspa;
 extern af_info_t af_info_center;
-extern af_info_t af_info_sinesupress;
+extern af_info_t af_info_sinesuppress;
 extern af_info_t af_info_karaoke;
 
 static af_info_t* filter_list[]={ 
@@ -59,7 +59,7 @@
    &af_info_ladspa,
 #endif
    &af_info_center,
-   &af_info_sinesupress,
+   &af_info_sinesuppress,
    &af_info_karaoke,
    NULL 
 };

Copied: trunk/libaf/af_sinesuppress.c (from r18611, /trunk/libaf/af_sinesupress.c)
==============================================================================
--- /trunk/libaf/af_sinesupress.c	(original)
+++ trunk/libaf/af_sinesuppress.c	Wed Jun  7 02:02:51 2006
@@ -21,7 +21,7 @@
 #include "af.h"
 
 // Data for specific instances of this filter
-typedef struct af_sinesupress_s
+typedef struct af_sinesuppress_s
 {
     double freq;
     double decay;
@@ -29,7 +29,7 @@
     double imag;
     double ref;
     double pos;
-}af_sinesupress_t;
+}af_sinesuppress_t;
 
 static af_data_t* play_s16(struct af_instance_s* af, af_data_t* data);
 static af_data_t* play_float(struct af_instance_s* af, af_data_t* data);
@@ -37,7 +37,7 @@
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_sinesupress_t* s   = (af_sinesupress_t*)af->setup; 
+  af_sinesuppress_t* s   = (af_sinesuppress_t*)af->setup; 
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
@@ -97,7 +97,7 @@
 // Filter data through filter
 static af_data_t* play_s16(struct af_instance_s* af, af_data_t* data)
 {
-  af_sinesupress_t *s = af->setup;
+  af_sinesuppress_t *s = af->setup;
   register int i = 0;
   int16_t *a = (int16_t*)data->audio;	// Audio data
   int len = data->len/2;		// Number of samples
@@ -121,7 +121,7 @@
     s->pos += 2 * M_PI * s->freq / data->rate;
   }
 
-   af_msg(AF_MSG_VERBOSE,"[sinesupress] f:%8.2f: amp:%8.2f\n", s->freq, sqrt(s->real*s->real + s->imag*s->imag) / s->ref);
+   af_msg(AF_MSG_VERBOSE,"[sinesuppress] f:%8.2f: amp:%8.2f\n", s->freq, sqrt(s->real*s->real + s->imag*s->imag) / s->ref);
 
   return data;
 }
@@ -129,7 +129,7 @@
 #if 0
 static af_data_t* play_float(struct af_instance_s* af, af_data_t* data)
 {
-  af_sinesupress_t *s = af->setup;
+  af_sinesuppress_t *s = af->setup;
   register int i = 0;
   float *a = (float*)data->audio;	// Audio data
   int len = data->len/4;		// Number of samples
@@ -158,19 +158,19 @@
   af->mul.n=1;
   af->mul.d=1;
   af->data=calloc(1,sizeof(af_data_t));
-  af->setup=calloc(1,sizeof(af_sinesupress_t));
+  af->setup=calloc(1,sizeof(af_sinesuppress_t));
   if(af->data == NULL || af->setup == NULL)
     return AF_ERROR;
 
-  ((af_sinesupress_t*)af->setup)->freq = 50.0;
-  ((af_sinesupress_t*)af->setup)->decay = 0.0001;
+  ((af_sinesuppress_t*)af->setup)->freq = 50.0;
+  ((af_sinesuppress_t*)af->setup)->decay = 0.0001;
   return AF_OK;
 }
 
 // Description of this filter
-af_info_t af_info_sinesupress = {
-    "Sine Supress",
-    "sinesupress",
+af_info_t af_info_sinesuppress = {
+    "Sine Suppress",
+    "sinesuppress",
     "Michael Niedermayer",
     "",
     0,

Modified: trunk/libaf/control.h
==============================================================================
--- trunk/libaf/control.h	(original)
+++ trunk/libaf/control.h	Wed Jun  7 02:02:51 2006
@@ -225,7 +225,7 @@
 #define AF_CONTROL_CENTER_CH		0x00002200 | AF_CONTROL_FILTER_SPECIFIC
 
 
-// SineSupress
+// SineSuppress
 #define AF_CONTROL_SS_FREQ		0x00002300 | AF_CONTROL_FILTER_SPECIFIC
 #define AF_CONTROL_SS_DECAY		0x00002400 | AF_CONTROL_FILTER_SPECIFIC