Changeset 8139b9059c5cf3c2ce771c545dd93a3df4ec08c4

Show
Ignore:
Timestamp:
10/07/07 01:32:37 (1 year ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1191713557 +0000
git-parent:

[b14c3b3726ef8809eef681005a9454067253e6b7]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1191713557 +0000
Message:

galaktos/*: warnings hunt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/visualization/galaktos/PCM.c

    rd6008a8 r8139b90  
    3131//Returns PCM Data or spectrum data, or the derivative of the PCM data 
    3232 
     33#include <stdlib.h> 
     34#include <stdio.h> 
    3335#include <inttypes.h> 
     36 
     37#include "fftsg.h" 
    3438 
    3539double **PCMd;    //data structure to store PCM data  PCM[channels][maxsamples] 

  • modules/visualization/galaktos/beat_detect.c

    rd6008a8 r8139b90  
    3131//Some stuff was taken from Frederic Patin's beat-detection article, you'll find it online 
    3232 
     33#include <stdlib.h> 
     34#include <stdio.h> 
    3335#include "engine_vars.h" 
    3436 

  • modules/visualization/galaktos/builtin_funcs.c

    rd6008a8 r8139b90  
    2525 
    2626#include <math.h> 
     27#include <stdlib.h> 
     28#include <stdio.h> 
    2729/* Values to optimize the sigmoid function */ 
    2830#define R  32767    
    2931#define RR 65534    
    3032  
    31 inline double int_wrapper(double * arg_list) { 
     33static inline double int_wrapper(double * arg_list) { 
    3234 
    3335  return floor(arg_list[0]); 
    …… 
    3638 
    3739 
    38 inline double sqr_wrapper(double * arg_list) { 
     40static inline double sqr_wrapper(double * arg_list) { 
    3941     
    4042    return pow(2, arg_list[0]); 
    …… 
    4244     
    4345     
    44 inline double sign_wrapper(double * arg_list) {    
     46static inline double sign_wrapper(double * arg_list) {     
    4547     
    4648    return -arg_list[0];     
    4749}    
    4850 
    49 inline double min_wrapper(double * arg_list) { 
     51static inline double min_wrapper(double * arg_list) { 
    5052     
    5153    if (arg_list[0] > arg_list[1]) 
    …… 
    5557}        
    5658 
    57 inline double max_wrapper(double * arg_list) { 
     59static inline double max_wrapper(double * arg_list) { 
    5860 
    5961    if (arg_list[0] > arg_list[1]) 
    …… 
    6466 
    6567/* consult your AI book */ 
    66 inline double sigmoid_wrapper(double * arg_list) { 
     68static inline double sigmoid_wrapper(double * arg_list) { 
    6769  return (RR / (1 + exp( -(((double)(arg_list[0])) * arg_list[1]) / R) - R)); 
    6870} 
    6971     
    7072     
    71 inline double bor_wrapper(double * arg_list) { 
     73static inline double bor_wrapper(double * arg_list) { 
    7274 
    7375    return (double)((int)arg_list[0] || (int)arg_list[1]); 
    7476}    
    7577     
    76 inline double band_wrapper(double * arg_list) { 
     78static inline double band_wrapper(double * arg_list) { 
    7779    return (double)((int)arg_list[0] && (int)arg_list[1]); 
    7880}    
    7981 
    80 inline double bnot_wrapper(double * arg_list) { 
     82static inline double bnot_wrapper(double * arg_list) { 
    8183    return (double)(!(int)arg_list[0]); 
    8284}        
    8385 
    84 inline double if_wrapper(double * arg_list) { 
     86static inline double if_wrapper(double * arg_list) { 
    8587 
    8688        if ((int)arg_list[0] == 0) 
    …… 
    9092 
    9193 
    92 inline double rand_wrapper(double * arg_list) { 
     94static inline double rand_wrapper(double * arg_list) { 
    9395  double l; 
    9496 
    …… 
    99101}    
    100102 
    101 inline double equal_wrapper(double * arg_list) { 
     103static inline double equal_wrapper(double * arg_list) { 
    102104 
    103105    return (arg_list[0] == arg_list[1]); 
    …… 
    105107 
    106108 
    107 inline double above_wrapper(double * arg_list) { 
     109static inline double above_wrapper(double * arg_list) { 
    108110 
    109111    return (arg_list[0] > arg_list[1]); 
    …… 
    111113 
    112114 
    113 inline double below_wrapper(double * arg_list) { 
     115static inline double below_wrapper(double * arg_list) { 
    114116 
    115117    return (arg_list[0] < arg_list[1]); 
    116118} 
    117119 
    118 inline double sin_wrapper(double * arg_list) { 
     120static inline double sin_wrapper(double * arg_list) { 
    119121    return (sin (arg_list[0]));  
    120122} 
    121123 
    122124 
    123 inline double cos_wrapper(double * arg_list) { 
     125static inline double cos_wrapper(double * arg_list) { 
    124126    return (cos (arg_list[0])); 
    125127} 
    126128 
    127 inline double tan_wrapper(double * arg_list) { 
     129static inline double tan_wrapper(double * arg_list) { 
    128130    return (tan(arg_list[0])); 
    129131} 
    130132 
    131 inline double asin_wrapper(double * arg_list) { 
     133static inline double asin_wrapper(double * arg_list) { 
    132134    return (asin (arg_list[0])); 
    133135} 
    134136 
    135 inline double acos_wrapper(double * arg_list) { 
     137static inline double acos_wrapper(double * arg_list) { 
    136138    return (acos (arg_list[0])); 
    137139} 
    138140 
    139 inline double atan_wrapper(double * arg_list) { 
     141static inline double atan_wrapper(double * arg_list) { 
    140142    return (atan (arg_list[0])); 
    141143} 
    142144 
    143 inline double atan2_wrapper(double * arg_list) { 
     145static inline double atan2_wrapper(double * arg_list) { 
    144146  return (atan2 (arg_list[0], arg_list[1])); 
    145147} 
    146148 
    147 inline double pow_wrapper(double * arg_list) { 
     149static inline double pow_wrapper(double * arg_list) { 
    148150  return (pow (arg_list[0], arg_list[1])); 
    149151} 
    150152 
    151 inline double exp_wrapper(double * arg_list) { 
     153static inline double exp_wrapper(double * arg_list) { 
    152154  return (exp(arg_list[0])); 
    153155} 
    154156 
    155 inline double abs_wrapper(double * arg_list) { 
     157static inline double abs_wrapper(double * arg_list) { 
    156158  return (fabs(arg_list[0])); 
    157159} 
    158160 
    159 inline double log_wrapper(double *arg_list) { 
     161static inline double log_wrapper(double *arg_list) { 
    160162  return (log (arg_list[0])); 
    161163} 
    162164 
    163 inline double log10_wrapper(double * arg_list) { 
     165static inline double log10_wrapper(double * arg_list) { 
    164166  return (log10 (arg_list[0])); 
    165167} 
    166168 
    167 inline double sqrt_wrapper(double * arg_list) { 
     169static inline double sqrt_wrapper(double * arg_list) { 
    168170  return (sqrt (arg_list[0])); 
    169171} 
    170172 
    171173 
    172 inline double nchoosek_wrapper(double * arg_list) { 
     174static inline double nchoosek_wrapper(double * arg_list) { 
    173175      unsigned long cnm = 1UL; 
    174176      int i, f; 
    …… 
    190192 
    191193 
    192 inline double fact_wrapper(double * arg_list) { 
     194static inline double fact_wrapper(double * arg_list) { 
    193195 
    194196 

  • modules/visualization/galaktos/custom_shape.c

    rd6008a8 r8139b90  
    2424 
    2525#include <stdio.h> 
     26#include <stdlib.h> 
    2627 
    2728#include "common.h" 
    …… 
    5556int cwave_interface_id = 0; 
    5657extern preset_t * active_preset; 
    57 inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape); 
     58static inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape); 
    5859void load_unspec_init_cond_shape(param_t * param); 
    5960 
    …… 
    519520} 
    520521 
    521 inline void evalCustomShapeInitConditions() { 
     522static inline void evalCustomShapeInitConditions() { 
    522523  splay_traverse(eval_custom_shape_init_conds, active_preset->custom_shape_tree); 
    523524 
    524525} 
    525526 
    526 inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape) { 
     527static inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape) { 
    527528  splay_traverse(eval_init_cond, custom_shape->init_cond_tree); 
    528529  splay_traverse(eval_init_cond, custom_shape->per_frame_init_eqn_tree); 
    …… 
    588589/* Interface function. Makes another custom shape the current 
    589590   concern for per frame / point equations */ 
    590 inline custom_shape_t * nextCustomShape() { 
     591static inline custom_shape_t * nextCustomShape() { 
    591592 
    592593  if ((interface_shape = splay_find(&cwave_interface_id, active_preset->custom_shape_tree)) == NULL) { 

  • modules/visualization/galaktos/custom_wave.c

    rd6008a8 r8139b90  
    2424 
    2525#include <stdio.h> 
     26#include <stdlib.h> 
     27#include <string.h> 
    2628 
    2729#include "common.h" 
    …… 
    6062int interface_id = 0; 
    6163extern preset_t * active_preset; 
    62 inline void eval_custom_wave_init_conds(custom_wave_t * custom_wave); 
     64static inline void eval_custom_wave_init_conds(custom_wave_t * custom_wave); 
    6365void load_unspec_init_cond(param_t * param); 
    6466void destroy_per_point_eqn_tree(splaytree_t * tree); 
    …… 
    6769void destroy_per_frame_init_eqn_tree(splaytree_t * tree); 
    6870void destroy_init_cond_tree(splaytree_t * tree); 
    69 inline void evalPerPointEqn(per_point_eqn_t * per_point_eqn); 
     71static inline void evalPerPointEqn(per_point_eqn_t * per_point_eqn); 
    7072 
    7173custom_wave_t * new_custom_wave(int id) { 
    …… 
    603605} 
    604606 
    605 inline void evalCustomWaveInitConditions() { 
     607static inline void evalCustomWaveInitConditions() { 
    606608  splay_traverse(eval_custom_wave_init_conds, active_preset->custom_wave_tree); 
    607609} 
    608610 
    609 inline void eval_custom_wave_init_conds(custom_wave_t * custom_wave) { 
     611static inline void eval_custom_wave_init_conds(custom_wave_t * custom_wave) { 
    610612  splay_traverse(eval_init_cond, custom_wave->init_cond_tree); 
    611613  splay_traverse(eval_init_cond, custom_wave->per_frame_init_eqn_tree); 
    …… 
    614616/* Interface function. Makes another custom wave the current 
    615617   concern for per frame / point equations */ 
    616 inline custom_wave_t * nextCustomWave() { 
     618static inline custom_wave_t * nextCustomWave() { 
    617619 
    618620  if ((interface_wave = splay_find(&interface_id, active_preset->custom_wave_tree)) == NULL) { 
    …… 
    629631 
    630632 
    631 inline void evalPerPointEqns() {  
     633static inline void evalPerPointEqns() {  
    632634 
    633635  int x; 
    …… 
    655657 
    656658/* Evaluates a per point equation for the current custom wave given by interface_wave ptr */ 
    657 inline void evalPerPointEqn(per_point_eqn_t * per_point_eqn) { 
     659static inline void evalPerPointEqn(per_point_eqn_t * per_point_eqn) { 
    658660   
    659661   

  • modules/visualization/galaktos/eval.c

    rd6008a8 r8139b90  
    2727/* Evaluation Code */ 
    2828 
     29#include <stdio.h> 
    2930#include "common.h" 
    3031#include "fatal.h" 
    …… 
    4849 
    4950 
    50 inline double eval_gen_expr(gen_expr_t * gen_expr) { 
     51static inline double eval_gen_expr(gen_expr_t * gen_expr) { 
    5152  double l; 
    5253 

  • modules/visualization/galaktos/fftsg.c

    rd6008a8 r8139b90  
    779779#endif 
    780780#include <pthread.h> 
     781#include <stdlib.h> 
     782#include <stdio.h> 
    781783#define cdft_thread_t pthread_t 
    782784#define cdft_thread_create(thp,func,argp) { \ 
    …… 
    804806#endif 
    805807#include <windows.h> 
     808<<<<<<< .working 
     809#include <stdlib.h> 
     810======= 
     811#include <stdio.h> 
     812>>>>>>> .merge-right.r21326 
    806813#define cdft_thread_t HANDLE 
    807814#define cdft_thread_create(thp,func,argp) { \ 

  • modules/visualization/galaktos/func.c

    rd6008a8 r8139b90  
    22 
    33#include <stdlib.h> 
     4#include <stdio.h> 
     5#include <string.h> 
    46 
    57#include "common.h" 

  • modules/visualization/galaktos/init_cond.c

    rd6008a8 r8139b90  
    2727/* Library functions to manipulate initial condition values */ 
    2828 
     29#include <stdio.h> 
     30#include <stdlib.h> 
     31#include <string.h> 
    2932 
    3033#include "common.h" 

  • modules/visualization/galaktos/main.c

    r9e595c9 r8139b90  
    2828#include <unistd.h> 
    2929#include <math.h> 
     30#include <stdlib.h> 
     31#include <stdio.h> 
    3032#include "common.h" 
    3133#include "preset_types.h" 

  • modules/visualization/galaktos/param.c

    rd6008a8 r8139b90  
    2828 
    2929#include <stdio.h> 
    30  
     30#include <string.h> 
     31#include <stdlib.h> 
    3132#include <math.h> 
    3233#include "fatal.h" 

  • modules/visualization/galaktos/parser.c

    rd6008a8 r8139b90  
    2828 
    2929#include <stdlib.h> 
     30#include <stdio.h> 
     31#include <string.h> 
    3032 
    3133#include "common.h" 

  • modules/visualization/galaktos/per_frame_eqn.c

    rd6008a8 r8139b90  
    2525#include <stdio.h> 
    2626#include <stdlib.h> 
     27#include <string.h> 
    2728 
    2829#include "fatal.h" 
    2930#include "common.h" 
     31#include "param.h" 
    3032#include "per_frame_eqn_types.h" 
    3133#include "per_frame_eqn.h" 

  • modules/visualization/galaktos/per_pixel_eqn.c

    rd6008a8 r8139b90  
    2323 *****************************************************************************/ 
    2424 
     25#include <stdio.h> 
     26#include <string.h> 
    2527#include <stdlib.h> 
    2628 
    …… 
    5153 
    5254/* Evaluates a per pixel equation */ 
    53 inline void evalPerPixelEqn(per_pixel_eqn_t * per_pixel_eqn) { 
     55static inline void evalPerPixelEqn(per_pixel_eqn_t * per_pixel_eqn) { 
    5456 
    5557  double ** param_matrix = NULL; 
    …… 
    9395} 
    9496 
    95 inline void evalPerPixelEqns() { 
     97static inline void evalPerPixelEqns() { 
    9698 
    9799  /* Evaluate all per pixel equations using splay traversal */ 
    …… 
    210212} 
    211213 
    212 inline int isPerPixelEqn(int op) { 
     214static inline int isPerPixelEqn(int op) { 
    213215     
    214216  return active_preset->per_pixel_flag[op]; 
    …… 
    216218} 
    217219 
    218 inline int resetPerPixelEqnFlags(preset_t * preset) { 
     220static inline int resetPerPixelEqnFlags(preset_t * preset) { 
    219221  int i; 
    220222 

  • modules/visualization/galaktos/preset.c

    rd6008a8 r8139b90  
    2424 
    2525#include <vlc/vlc.h> 
    26  
    27  
     26#include <vlc_charset.h> 
     27 
     28#include <stdlib.h> 
     29#include <stdio.h> 
    2830#include <dirent.h> 
    2931#include <time.h> 

  • modules/visualization/galaktos/splaytree.c

    rd6008a8 r8139b90  
    7474 
    7575#include <stdlib.h> 
     76#include <stdio.h> 
    7677 
    7778#include "common.h" 
    …… 
    9596/* Creates a splay tree given a compare key function, copy key function, and free key function. 
    9697   Ah yes, the wonders of procedural programming */ 
    97 inline splaytree_t * create_splaytree(int (*compare)(), void * (*copy_key)(), void (*free_key)()) { 
     98static inline splaytree_t * create_splaytree(int (*compare)(), void * (*copy_key)(), void (*free_key)()) { 
    9899 
    99100  splaytree_t * splaytree; 
    …… 
    114115 
    115116/* Destroys a splay tree */ 
    116 inline int destroy_splaytree(splaytree_t * splaytree) { 
     117static inline int destroy_splaytree(splaytree_t * splaytree) { 
    117118 
    118119  /* Null argument check */ 
    …… 
    159160 
    160161/* Traverses the entire splay tree with the given function func_ptr */ 
    161 inline void splay_traverse(void (*func_ptr)(), splaytree_t * splaytree) { 
     162static inline void splay_traverse(void (*func_ptr)(), splaytree_t * splaytree) { 
    162163 
    163164  /* Null argument check */ 
    …… 
    205206 
    206207/* Find the node corresponding to the given key in splaytree, return its data pointer */ 
    207 inline void * splay_find(void * key, splaytree_t * splaytree) { 
     208static inline void * splay_find(void * key, splaytree_t * splaytree) { 
    208209 
    209210  splaynode_t * splaynode; 
    …… 
    245246 
    246247/* Gets the splaynode that the given key points to */ 
    247 inline splaynode_t * get_splaynode_of(void * key, splaytree_t * splaytree) { 
     248static inline splaynode_t * get_splaynode_of(void * key, splaytree_t * splaytree) { 
    248249 
    249250  splaynode_t * splaynode; 
    …… 
    326327/* Deletes a splay node from a splay tree. If the node doesn't exist 
    327328   then nothing happens */ 
    328 inline int splay_delete(void * key, splaytree_t * splaytree) { 
     329static inline int splay_delete(void * key, splaytree_t * splaytree) { 
    329330   
    330331  splaynode_t * splaynode; 
    …… 
    403404 
    404405/* Inserts a link into the splay tree */ 
    405 inline int splay_insert_link(void * alias_key, void * orig_key, splaytree_t * splaytree) { 
     406static inline int splay_insert_link(void * alias_key, void * orig_key, splaytree_t * splaytree) { 
    406407 
    407408   splaynode_t * splaynode, * data_node; 
    …… 
    440441 
    441442/* Inserts 'data' into the 'splaytree' paired with the passed 'key' */ 
    442 inline int splay_insert(void * data, void * key, splaytree_t * splaytree) { 
     443static inline int splay_insert(void * data, void * key, splaytree_t * splaytree) { 
    443444 
    444445    splaynode_t * splaynode; 
    …… 
    528529 
    529530/* Returns the 'maximum' key that is less than the given key in the splaytree */ 
    530 inline void * splay_find_below_max(void * key, splaytree_t * splaytree) { 
     531static inline void * splay_find_below_max(void * key, splaytree_t * splaytree) { 
    531532     
    532533    void * closest_key; 
    …… 
    549550 
    550551/* Returns the 'minimum' key that is greater than the given key in the splaytree */ 
    551 inline void * splay_find_above_min(void * key, splaytree_t * splaytree) { 
     552static inline void * splay_find_above_min(void * key, splaytree_t * splaytree) { 
    552553     
    553554    void * closest_key; 
    …… 
    644645 
    645646/* Find the minimum entry of the splay tree */ 
    646 inline void * splay_find_min(splaytree_t * t) { 
     647static inline void * splay_find_min(splaytree_t * t) { 
    647648 
    648649    splaynode_t * splaynode; 
    …… 
    663664 
    664665/* Find the maximum entry of the splay tree */ 
    665 inline void * splay_find_max(splaytree_t * t) { 
     666static inline void * splay_find_max(splaytree_t * t) { 
    666667 
    667668    splaynode_t * splaynode; 
    …… 
    681682} 
    682683 
    683 inline int splay_size(splaytree_t * t) { 
     684static inline int splay_size(splaytree_t * t) { 
    684685 
    685686    if (t == NULL) 

  • modules/visualization/galaktos/tree_types.c

    rd6008a8 r8139b90  
    2323 *****************************************************************************/ 
    2424 
     25#define _GNU_SOURCE 
     26#include <stdio.h> 
    2527#include <stdlib.h> 
    26  
     28#include <string.h> 
    2729#include "common.h" 
    2830 

  • modules/visualization/galaktos/video_init.c

    rd6008a8 r8139b90  
    3333//just call init_display again with differant variables 
    3434 
     35#include <stdlib.h> 
    3536#include <GL/gl.h> 
    3637#include <GL/glu.h>