Changeset 471

Show
Ignore:
Timestamp:
01/16/07 19:23:06 (2 years ago)
Author:
radekk
Message:

Indenting source code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/branches/display-cache/include/sweep/sweep.h

    r124 r471  
    3333#include <sweep/sweep_filter.h> 
    3434 
    35 #endif  /* __SWEEP_H__ */ 
    36  
    37  
    38  
    39  
    40  
    41  
     35#endif /* __SWEEP_H__ */ 

  • sweep/branches/display-cache/include/sweep/sweep_filter.h

    r124 r471  
    2626                                   sw_framecount_t nr_frames, 
    2727                                   sw_param_set pset, gpointer custom_data); 
    28 sw_op_instance * 
    29 perform_filter_region_op (sw_sample * sample, char * desc, 
    30                           SweepFilterRegion func, sw_param_set pset, 
    31                           gpointer custom_data); 
     28sw_op_instance *perform_filter_region_op (sw_sample * sample, char *desc, 
     29                                         SweepFilterRegion func, 
     30                                        sw_param_set pset, 
     31                                         gpointer custom_data); 
    3232 
    33 sw_op_instance * 
    34 perform_filter_op (sw_sample * sample, char * desc, SweepFilter func, 
    35                    sw_param_set pset, gpointer custom_data); 
     33sw_op_instance *perform_filter_op (sw_sample * sample, char *desc, 
     34                                  SweepFilter func, sw_param_set pset, 
     35                                  gpointer custom_data); 
    3636 
    3737 

  • sweep/branches/display-cache/include/sweep/sweep_sample.h

    r124 r471  
    2424#include <sweep/sweep_types.h> 
    2525 
    26 sw_sample * 
    27 sample_new_empty(char * pathname, gint nr_channels, gint sample_rate, 
    28                  gint sample_length); 
     26sw_sample *sample_new_empty (char *pathname, gint nr_channels, 
     27                             gint sample_rate, gint sample_length); 
    2928 
    30 sw_sample * 
    31 sample_new_copy(sw_sample * s); 
     29sw_sample *sample_new_copy (sw_sample * s); 
    3230 
    33 void 
    34 sample_destroy (sw_sample * s); 
     31void sample_destroy (sw_sample * s); 
    3532 
    36 sw_sounddata * 
    37 sample_get_sounddata (sw_sample * s); 
     33sw_sounddata *sample_get_sounddata (sw_sample * s); 
    3834 
    39 void 
    40 sample_set_file_format (sw_sample * s, sw_file_format_t file_format); 
     35void sample_set_file_format (sw_sample * s, sw_file_format_t file_format); 
    4136 
    42 void 
    43 sample_set_pathname (sw_sample * s, char * pathname); 
     37void sample_set_pathname (sw_sample * s, char *pathname); 
    4438 
    45 GList * 
    46 sample_bank_list_names (void); 
     39GList *sample_bank_list_names (void); 
    4740 
    48 sw_sample * 
    49 sample_bank_find_byname (const gchar * name); 
     41sw_sample *sample_bank_find_byname (const gchar * name); 
    5042 
    51 gboolean 
    52 sample_bank_contains (sw_sample *s); 
     43gboolean sample_bank_contains (sw_sample * s); 
    5344 
    54 void 
    55 sample_bank_add (sw_sample * s); 
     45void sample_bank_add (sw_sample * s); 
    5646 
    57 void 
    58 sample_bank_remove (sw_sample * s); 
     47void sample_bank_remove (sw_sample * s); 
    5948 
    60 void 
    61 sample_refresh_views (sw_sample * s); 
     49void sample_refresh_views (sw_sample * s); 
    6250 
    63 void 
    64 sample_start_marching_ants (sw_sample * s); 
     51void sample_start_marching_ants (sw_sample * s); 
    6552 
    66 void 
    67 sample_stop_marching_ants (sw_sample * s); 
     53void sample_stop_marching_ants (sw_sample * s); 
    6854 
    69 void 
    70 sample_set_edit_state (sw_sample * s, sw_edit_state edit_state); 
     55void sample_set_edit_state (sw_sample * s, sw_edit_state edit_state); 
    7156 
    72 void 
    73 sample_set_edit_mode (sw_sample * s, sw_edit_mode edit_mode); 
     57void sample_set_edit_mode (sw_sample * s, sw_edit_mode edit_mode); 
    7458 
    75 void 
    76 sample_refresh_playmode (sw_sample * s); 
     59void sample_refresh_playmode (sw_sample * s); 
    7760 
    78 void 
    79 sample_set_previewing (sw_sample * s, gboolean previewing); 
     61void sample_set_previewing (sw_sample * s, gboolean previewing); 
    8062 
    81 void 
    82 sample_set_stop_offset (sw_sample * s); 
     63void sample_set_stop_offset (sw_sample * s); 
    8364 
    8465void 
    …… 
    8667                       gboolean by_user); 
    8768 
    88 void 
    89 sample_set_rec_marker (sw_sample * s, sw_framecount_t offset); 
     69void sample_set_rec_marker (sw_sample * s, sw_framecount_t offset); 
    9070 
    91 void 
    92 sample_set_scrubbing (sw_sample * s, gboolean scrubbing); 
     71void sample_set_scrubbing (sw_sample * s, gboolean scrubbing); 
    9372 
    94 void 
    95 sample_set_looping (sw_sample * s, gboolean looping); 
     73void sample_set_looping (sw_sample * s, gboolean looping); 
    9674 
    97 void 
    98 sample_set_playrev (sw_sample * s, gboolean reverse); 
     75void sample_set_playrev (sw_sample * s, gboolean reverse); 
    9976 
    100 void 
    101 sample_set_mute (sw_sample * s, gboolean mute); 
     77void sample_set_mute (sw_sample * s, gboolean mute); 
    10278 
    103 void 
    104 sample_set_color (sw_sample * s, gint color); 
     79void sample_set_color (sw_sample * s, gint color); 
    10580 
    106 void 
    107 sample_set_progress_text (sw_sample * s, gchar * text); 
     81void sample_set_progress_text (sw_sample * s, gchar * text); 
    10882 
    109 void 
    110 sample_set_progress_percent (sw_sample * s, gint percent); 
     83void sample_set_progress_percent (sw_sample * s, gint percent); 
    11184 
    112 void 
    113 sample_refresh_progress_percent (sw_sample * s); 
     85void sample_refresh_progress_percent (sw_sample * s); 
    11486 
    115 int 
    116 sample_set_progress_ready (sw_sample * s); 
     87int sample_set_progress_ready (sw_sample * s); 
    11788 
    118 void 
    119 sample_set_tmp_message (sw_sample * s, const char * fmt, ...); 
     89void sample_set_tmp_message (sw_sample * s, const char *fmt, ...); 
    12090 
    12191/* 
    …… 
    12999 * 
    130100 */ 
    131 void 
    132 sample_replace_throughout (sw_sample * os, sw_sample * s); 
     101void sample_replace_throughout (sw_sample * os, sw_sample * s); 
    133102 
    134103 
    135104/* Selection handling */ 
    136105 
    137 gboolean 
    138 sample_offset_in_sel (sw_sample * s, sw_framecount_t offset); 
     106gboolean sample_offset_in_sel (sw_sample * s, sw_framecount_t offset); 
    139107 
    140 guint 
    141 sample_sel_nr_regions (sw_sample * s); 
     108guint sample_sel_nr_regions (sw_sample * s); 
    142109 
    143 void 
    144 sample_clear_selection (sw_sample * s); 
     110void sample_clear_selection (sw_sample * s); 
    145111 
    146 void 
    147 sample_add_selection (sw_sample * s, sw_sel * sel); 
     112void sample_add_selection (sw_sample * s, sw_sel * sel); 
    148113 
    149 sw_sel * 
    150 sample_add_selection_1 (sw_sample * s, 
    151                         sw_framecount_t start, sw_framecount_t end); 
     114sw_sel *sample_add_selection_1 (sw_sample * s, 
     115                                sw_framecount_t start, sw_framecount_t end); 
    152116 
    153 void 
    154 sample_set_selection (sw_sample * s, GList * gl); 
     117void sample_set_selection (sw_sample * s, GList * gl); 
    155118 
    156 sw_sel * 
    157 sample_set_selection_1 (sw_sample * s, 
    158                         sw_framecount_t start, sw_framecount_t end); 
     119sw_sel *sample_set_selection_1 (sw_sample * s, 
     120                                sw_framecount_t start, sw_framecount_t end); 
    159121 
    160122 
    …… 
    164126                         sw_framecount_t new_start, sw_framecount_t new_end); 
    165127 
    166 void 
    167 sample_selection_invert (sw_sample * s); 
     128void sample_selection_invert (sw_sample * s); 
    168129 
    169 void 
    170 sample_selection_select_all (sw_sample * s); 
     130void sample_selection_select_all (sw_sample * s); 
    171131 
    172 void 
    173 sample_selection_select_none (sw_sample * s); 
     132void sample_selection_select_none (sw_sample * s); 
    174133 
    175 void 
    176 sample_selection_halve (sw_sample * s); 
     134void sample_selection_halve (sw_sample * s); 
    177135 
    178 void 
    179 sample_selection_double (sw_sample * s); 
     136void sample_selection_double (sw_sample * s); 
    180137 
    181 void 
    182 sample_selection_shift_left (sw_sample * s); 
     138void sample_selection_shift_left (sw_sample * s); 
    183139 
    184 void 
    185 sample_selection_shift_right (sw_sample * s); 
     140void sample_selection_shift_right (sw_sample * s); 
    186141 
    187142/* info dialog */ 
    188 void 
    189 sample_show_info_dialog (sw_sample * sample); 
     143void sample_show_info_dialog (sw_sample * sample); 
    190144 
    191145 

  • sweep/branches/display-cache/include/sweep/sweep_selection.h

    r124 r471  
    2222#define __SWEEP_SELECTION_H__ 
    2323 
    24 sw_sel * 
    25 sel_new (sw_framecount_t start, sw_framecount_t end); 
     24sw_sel *sel_new (sw_framecount_t start, sw_framecount_t end); 
    2625 
    27 sw_sel * 
    28 sel_copy (sw_sel * sel); 
     26sw_sel *sel_copy (sw_sel * sel); 
    2927 
    30 GList * 
    31 sels_add_selection (GList * sels, sw_sel * sel); 
     28GList *sels_add_selection (GList * sels, sw_sel * sel); 
    3229 
    33 GList * 
    34 sels_add_selection_1 (GList * sels, sw_framecount_t start, sw_framecount_t end); 
     30GList *sels_add_selection_1 (GList * sels, sw_framecount_t start, 
     31                            sw_framecount_t end); 
    3532 
    3633/* 
    …… 
    4037 * return > 0 if s1 comes after s2 in the sort order. 
    4138 */ 
    42 gint 
    43 sel_cmp (sw_sel * s1, sw_sel * s2); 
     39gint sel_cmp (sw_sel * s1, sw_sel * s2); 
    4440 
    4541/* 
    …… 
    4844 * returns a copy of sels 
    4945 */ 
    50 GList * 
    51 sels_copy (GList * sels); 
     46GList *sels_copy (GList * sels); 
    5247 
    5348/* 
    …… 
    5651 * inverts sels in place 
    5752 */ 
    58 GList * 
    59 sels_invert (GList * sels, sw_framecount_t nr_frames); 
     53GList *sels_invert (GList * sels, sw_framecount_t nr_frames); 
    6054 
    61 sw_op_instance * 
    62 perform_selection_op (sw_sample * s, char * desc, SweepFilter func, 
    63                       sw_param_set pset, gpointer custom_data); 
     55sw_op_instance *perform_selection_op (sw_sample * s, char *desc, 
     56                                     SweepFilter func, sw_param_set pset, 
     57                                    gpointer custom_data); 
    6458 
    6559#endif /* __SWEEP_SELECTION_H__ */ 

  • sweep/branches/display-cache/include/sweep/sweep_sounddata.h

    r124 r471  
    2222#define __SWEEP_SOUNDDATA_H__ 
    2323 
    24 sw_sounddata * 
    25 sounddata_new_empty(gint nr_channels, gint sample_rate, gint sample_length); 
     24sw_sounddata *sounddata_new_empty (gint nr_channels, gint sample_rate, 
     25                                  gint sample_length); 
    2626 
    27 void 
    28 sounddata_destroy (sw_sounddata * sounddata); 
     27void sounddata_destroy (sw_sounddata * sounddata); 
    2928 
    30 void 
    31 sounddata_lock_selection (sw_sounddata * sounddata); 
     29void sounddata_lock_selection (sw_sounddata * sounddata); 
    3230 
    33 void 
    34 sounddata_unlock_selection (sw_sounddata * sounddata); 
     31void sounddata_unlock_selection (sw_sounddata * sounddata); 
    3532 
    36 void 
    37 sounddata_clear_selection (sw_sounddata * sounddata); 
     33void sounddata_clear_selection (sw_sounddata * sounddata); 
    3834 
    3935/* 
    …… 
    4440 */ 
    4541 
    46 void 
    47 sounddata_normalise_selection (sw_sounddata * sounddata); 
     42void sounddata_normalise_selection (sw_sounddata * sounddata); 
    4843 
    49 void 
    50 sounddata_add_selection (sw_sounddata * sounddata, sw_sel * sel); 
     44void sounddata_add_selection (sw_sounddata * sounddata, sw_sel * sel); 
    5145 
    52 sw_sel * 
    53 sounddata_add_selection_1 (sw_sounddata * sounddata, 
    54                            sw_framecount_t start, sw_framecount_t end); 
     46sw_sel *sounddata_add_selection_1 (sw_sounddata * sounddata, 
     47                                  sw_framecount_t start, 
     48                                  sw_framecount_t end); 
    5549 
    56 sw_sel * 
    57 sounddata_set_selection_1 (sw_sounddata * sounddata, 
    58                            sw_framecount_t start, sw_framecount_t end); 
     50sw_sel *sounddata_set_selection_1 (sw_sounddata * sounddata, 
     51                                  sw_framecount_t start, 
     52                                  sw_framecount_t end); 
    5953 
    60 guint 
    61 sounddata_selection_nr_regions (sw_sounddata * sounddata); 
     54guint sounddata_selection_nr_regions (sw_sounddata * sounddata); 
    6255 
    63 gint 
    64 sounddata_selection_nr_frames (sw_sounddata * sounddata); 
     56gint sounddata_selection_nr_frames (sw_sounddata * sounddata); 
    6557 
    66 gint 
    67 sounddata_selection_width (sw_sounddata * sounddata); 
     58gint sounddata_selection_width (sw_sounddata * sounddata); 
    6859 
    69 void 
    70 sounddata_selection_translate (sw_sounddata * sounddata, gint delta); 
     60void sounddata_selection_translate (sw_sounddata * sounddata, gint delta); 
    7161 
    72 void 
    73 sounddata_selection_scale (sw_sounddata * sounddata, gfloat scale); 
     62void sounddata_selection_scale (sw_sounddata * sounddata, gfloat scale); 
    7463 
    7564/* 

  • sweep/branches/display-cache/include/sweep/sweep_typeconvert.h

    r57 r471  
    2626 * in a given format. 
    2727 */ 
    28 glong 
    29 frames_to_samples (sw_format * format, sw_framecount_t nr_frames); 
     28glong frames_to_samples (sw_format * format, sw_framecount_t nr_frames); 
    3029 
    3130/* 
    3231 * Determine the size in bytes of a number of frames of a given format. 
    3332 */ 
    34 glong 
    35 frames_to_bytes (sw_format * format, sw_framecount_t nr_frames); 
     33glong frames_to_bytes (sw_format * format, sw_framecount_t nr_frames); 
    3634 
    3735/* 
    3836 * Convert a number of frames to seconds 
    3937 */ 
    40 sw_time_t 
    41 frames_to_time (sw_format * format, sw_framecount_t nr_frames); 
     38sw_time_t frames_to_time (sw_format * format, sw_framecount_t nr_frames); 
    4239 
    4340/* 
    4441 * Convert seconds to frames 
    4542 */ 
    46 sw_framecount_t 
    47 time_to_frames (sw_format * format, sw_time_t time); 
     43sw_framecount_t time_to_frames (sw_format * format, sw_time_t time); 
    4844 
    4945#endif /* __SWEEP_TYPE_CONVERT_H__ */ 

  • sweep/branches/display-cache/include/sweep/sweep_types.h

    r304 r471  
    2323 
    2424#include <glib.h> 
    25 #include <gdk/gdktypes.h>  /* XXX: for GdkModifierType */ 
    26 #include <gtk/gtk.h> /* XXX: for info_clist widget */ 
     25#include <gdk/gdktypes.h>      /* XXX: for GdkModifierType */ 
     26#include <gtk/gtk.h>           /* XXX: for info_clist widget */ 
    2727 
    2828#include <sys/types.h> 
    …… 
    5454#if 0 
    5555 
    56 #if (SIZEOF_OFF_T == 8)  
     56#if (SIZEOF_OFF_T == 8) 
    5757/* For libsndfile version 1 */ 
    5858typedef off_t sw_framecount_t; 
    …… 
    9090 * 
    9191 */ 
    92 struct _sw_sel { 
     92struct _sw_sel 
     93{ 
    9394  sw_framecount_t sel_start; 
    9495  sw_framecount_t sel_end; 
    …… 
    100101 * Multichannel data is interleaved: Stereo is stored LR. 
    101102 */ 
    102 struct _sw_format { 
    103   gint channels;  /* nr channels per frame */ 
    104   gint rate;      /* sampling rate (Hz) */ 
    105 }; 
    106  
    107 struct _sw_sounddata { 
     103struct _sw_format 
     104{ 
     105  gint channels;                /* nr channels per frame */ 
     106  gint rate;                    /* sampling rate (Hz) */ 
     107}; 
     108 
     109struct _sw_sounddata 
     110{ 
    108111  int refcount; 
    109112 
    110   sw_format * format; 
    111   sw_framecount_t nr_frames;    /* nr frames */ 
     113  sw_format *format; 
     114  sw_framecount_t nr_frames;   /* nr frames */ 
    112115 
    113116  gpointer data; 
    114   GMutex * data_mutex; /* Mutex for access to sample data */ 
    115          
    116   GList * sels;     /* selection: list of sw_sels */ 
    117   GMutex * sels_mutex; /* Mutex for access to sels */ 
     117  GMutex *data_mutex;          /* Mutex for access to sample data */ 
     118 
     119  GList *sels;                 /* selection: list of sw_sels */ 
     120  GMutex *sels_mutex;          /* Mutex for access to sels */ 
    118121}; 
    119122 
    …… 
    121124 
    122125 
    123 typedef enum { 
     126typedef enum 
     127{ 
    124128  SWEEP_EDIT_MODE_READY, 
    125   SWEEP_EDIT_MODE_META, /* modifying metadata: sels etc. */ 
     129  SWEEP_EDIT_MODE_META,                /* modifying metadata: sels etc. */ 
    126130  SWEEP_EDIT_MODE_FILTER, 
    127131  SWEEP_EDIT_MODE_ALLOC, 
    128132} sw_edit_mode; 
    129133 
    130 typedef enum { 
     134typedef enum 
     135{ 
    131136  SWEEP_EDIT_STATE_IDLE, 
    132137  SWEEP_EDIT_STATE_PENDING, 
    …… 
    136141} sw_edit_state; 
    137142 
    138 typedef enum { 
     143typedef enum 
     144{ 
    139145  SWEEP_TRANSPORT_STOP, 
    140146  SWEEP_TRANSPORT_PLAY, 
    …… 
    143149 
    144150/* File formats */ 
    145 typedef enum { 
    146   SWEEP_FILE_FORMAT_NONE=0, 
    147   SWEEP_FILE_FORMAT_BY_EXTENSION=0, 
     151typedef enum 
     152{ 
     153  SWEEP_FILE_FORMAT_NONE = 0, 
     154  SWEEP_FILE_FORMAT_BY_EXTENSION = 0, 
    148155  SWEEP_FILE_FORMAT_RAW, 
    149156  SWEEP_FILE_FORMAT_WAV, 
    …… 
    165172 * The length of data available *data is (end - start) 
    166173 */ 
    167 struct _sw_edit_region { 
     174struct _sw_edit_region 
     175{ 
    168176  sw_framecount_t start; 
    169177  sw_framecount_t end; 
    …… 
    172180}; 
    173181 
    174 struct _sw_edit_buffer { 
    175   sw_format * format; 
    176   GList * regions; 
     182struct _sw_edit_buffer 
     183{ 
     184  sw_format *format; 
     185  GList *regions; 
    177186  gint refcount; 
    178187}; 
    …… 
    186195typedef struct _sw_op_instance sw_op_instance; 
    187196 
    188 struct _sw_operation { 
     197struct _sw_operation 
     198{ 
    189199  sw_edit_mode edit_mode; 
    190200  SweepCallback _do_; 
    …… 
    196206}; 
    197207 
    198 struct _sw_op_instance { 
    199   sw_sample * sample; 
    200   char * description; 
    201   sw_operation * op; 
     208struct _sw_op_instance 
     209{ 
     210  sw_sample *sample; 
     211  char *description; 
     212  sw_operation *op; 
    202213  gpointer do_data; 
    203214  gpointer undo_data; 
    …… 
    208219 * Basic types for parameters 
    209220 */ 
    210 typedef enum { 
     221typedef enum 
     222{ 
    211223  SWEEP_TYPE_BOOL = 0, 
    212224  SWEEP_TYPE_INT, 
    …… 
    218230typedef gint sw_int; 
    219231typedef gdouble sw_float; 
    220 typedef gchar * sw_string; 
     232typedef gchar *sw_string; 
    221233 
    222234 
    …… 
    225237 */ 
    226238typedef union _sw_param sw_param; 
    227 typedef sw_param * sw_param_set; 
    228  
    229 union _sw_param { 
     239typedef sw_param *sw_param_set; 
     240 
     241union _sw_param 
     242{ 
    230243  sw_bool b; 
    231   sw_int i; 
     244  sw_int i; 
    232245  sw_float f; 
    233246  sw_string s; 
    …… 
    243256 * the usage of the sw_constraint. 
    244257 */ 
    245 typedef enum { 
     258typedef enum 
     259{ 
    246260/* 
    247261 * SW_PARAM_CONSTRAINED_NOT indicates that the parameter is completely 
    …… 
    253267 *     How free is its life, how wretched its lot! 
    254268 */ 
    255   SW_PARAM_CONSTRAINED_NOT=0, 
     269  SW_PARAM_CONSTRAINED_NOT = 0, 
    256270 
    257271/* 
    …… 
    303317#define SW_RANGE_STEP_VALID (1<<2) 
    304318 
    305 #define SW_RANGE_ALL_VALID (SW_RANGE_LOWER_BOUND_VALID|SW_RANGE_UPPER_BOUND_VALID|SW_RANGE_STEP_VALID)  
     319#define SW_RANGE_ALL_VALID (SW_RANGE_LOWER_BOUND_VALID|SW_RANGE_UPPER_BOUND_VALID|SW_RANGE_STEP_VALID) 
    306320 
    307321/* 
    …… 
    335349 */ 
    336350#define SW_PARAM_HINT_FILENAME     (1<<3) 
    337   
     351 
    338352 
    339353typedef struct _sw_param_spec sw_param_spec; 
    …… 
    355369 * string parameters. 
    356370 */ 
    357 struct _sw_param_range { 
     371struct _sw_param_range 
     372{ 
    358373  int valid_mask; 
    359374  sw_param lower; 
    …… 
    369384 * All constraints are disregarded for boolean parameters. 
    370385 */ 
    371 union _sw_constraint { 
     386union _sw_constraint 
     387{ 
    372388  /* 
    373389   * param_list: Values are constrained to those within a list of 
    …… 
    376392   * ie. this length = constraint->param_list[0].i 
    377393   */ 
    378   sw_param * list; 
     394  sw_param *list; 
    379395 
    380396  /* 
    381397   * param_range, as described above. 
    382398   */ 
    383   sw_param_range * range;  /* param range */ 
     399  sw_param_range *range;       /* param range */ 
    384400}; 
    385401 
    …… 
    388404 * sw_param_spec: specification for a parameter. 
    389405 */ 
    390 struct _sw_param_spec { 
     406struct _sw_param_spec 
     407{ 
    391408  /* A short name for this parameter */ 
    392   gchar * name; 
     409  gchar *name; 
    393410 
    394411  /* A longer description of the parameter's purpose and usage */ 
    395   gchar * desc; 
     412  gchar *desc; 
    396413 
    397414  /* The type of the parameter */ 
    …… 
    414431typedef struct _sw_plugin sw_plugin; 
    415432 
    416 struct _sw_procedure { 
    417   gchar * name; 
    418   gchar * description; 
    419   gchar * author; 
    420   gchar * copyright; 
    421   gchar * url; 
    422  
    423   gchar * identifier; 
     433struct _sw_procedure 
     434{ 
     435  gchar *name; 
     436  gchar *description; 
     437  gchar *author; 
     438  gchar *copyright; 
     439  gchar *url; 
     440 
     441  gchar *identifier; 
    424442 
    425443  /* Key bindings */ 
    …… 
    428446 
    429447  gint nr_params; 
    430   sw_param_spec * param_specs; 
     448  sw_param_spec *param_specs; 
    431449 
    432450  /* suggest sets suggested values for the members of pset, 
    …… 
    446464   * If nr_params is 0 then this function will be passed a NULL pset. 
    447465   */ 
    448   sw_op_instance * (*apply) (sw_sample * sample, 
    449                             sw_param_set pset, gpointer custom_data); 
     466  sw_op_instance *(*apply) (sw_sample * sample, 
     467                            sw_param_set pset, gpointer custom_data); 
    450468 
    451469  /* custom data to pass to the suggest and apply functions */ 
    …… 
    453471}; 
    454472 
    455 struct _sw_plugin { 
     473struct _sw_plugin 
     474{ 
    456475  /* plugin_init () returns a list of procedures */ 
    457   GList * (*plugin_init) (void); 
     476  GList *(*plugin_init) (void); 
    458477 
    459478  /* plugin_cleanup() frees the plugin's private data structures */ 
    …… 
    461480}; 
    462481 
    463 typedef sw_sample * (*SweepFilter) (sw_sample * sample, 
    464                                     sw_param_set pset, 
    465                                     gpointer custom_data); 
    466  
    467  
    468 #endif  /* __SWEEP_TYPES_H__ */ 
    469  
    470  
    471  
    472  
    473  
    474  
     482typedef sw_sample *(*SweepFilter) (sw_sample * sample, 
     483                                   sw_param_set pset, gpointer custom_data); 
     484 
     485 
     486#endif /* __SWEEP_TYPES_H__ */ 

  • sweep/branches/display-cache/include/sweep/sweep_undo.h

    <
    r124 r471  
    2424#include "sweep_types.h" 
    2525