Changeset 471
- Timestamp:
- 01/16/07 19:23:06 (2 years ago)
- Files:
-
- sweep/branches/display-cache/include/sweep/sweep.h (modified) (1 diff)
- sweep/branches/display-cache/include/sweep/sweep_filter.h (modified) (1 diff)
- sweep/branches/display-cache/include/sweep/sweep_sample.h (modified) (4 diffs)
- sweep/branches/display-cache/include/sweep/sweep_selection.h (modified) (4 diffs)
- sweep/branches/display-cache/include/sweep/sweep_sounddata.h (modified) (2 diffs)
- sweep/branches/display-cache/include/sweep/sweep_typeconvert.h (modified) (1 diff)
- sweep/branches/display-cache/include/sweep/sweep_types.h (modified) (27 diffs)
- sweep/branches/display-cache/include/sweep/sweep_undo.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/bindtextdom.c (modified) (12 diffs)
- sweep/branches/display-cache/intl/dcgettext.c (modified) (1 diff)
- sweep/branches/display-cache/intl/dcigettext.c (modified) (37 diffs)
- sweep/branches/display-cache/intl/eval-plural.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/explodename.c (modified) (4 diffs)
- sweep/branches/display-cache/intl/finddomain.c (modified) (5 diffs)
- sweep/branches/display-cache/intl/gettextP.h (modified) (3 diffs)
- sweep/branches/display-cache/intl/gmo.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/intl-compat.c (modified) (9 diffs)
- sweep/branches/display-cache/intl/l10nflist.c (modified) (7 diffs)
- sweep/branches/display-cache/intl/langprefs.c (modified) (4 diffs)
- sweep/branches/display-cache/intl/loadinfo.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/loadmsgcat.c (modified) (27 diffs)
- sweep/branches/display-cache/intl/localcharset.c (modified) (6 diffs)
- sweep/branches/display-cache/intl/localcharset.h (modified) (3 diffs)
- sweep/branches/display-cache/intl/localealias.c (modified) (9 diffs)
- sweep/branches/display-cache/intl/localename.c (modified) (16 diffs)
- sweep/branches/display-cache/intl/log.c (modified) (1 diff)
- sweep/branches/display-cache/intl/os2compat.c (modified) (6 diffs)
- sweep/branches/display-cache/intl/plural-exp.c (modified) (2 diffs)
- sweep/branches/display-cache/intl/plural-exp.h (modified) (1 diff)
- sweep/branches/display-cache/intl/plural.c (modified) (35 diffs)
- sweep/branches/display-cache/intl/printf-args.c (modified) (2 diffs)
- sweep/branches/display-cache/intl/printf-args.h (modified) (3 diffs)
- sweep/branches/display-cache/intl/printf-parse.c (modified) (7 diffs)
- sweep/branches/display-cache/intl/printf-parse.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/printf.c (modified) (16 diffs)
- sweep/branches/display-cache/intl/relocatable.c (modified) (7 diffs)
- sweep/branches/display-cache/intl/relocatable.h (modified) (4 diffs)
- sweep/branches/display-cache/intl/textdomain.c (modified) (3 diffs)
- sweep/branches/display-cache/intl/vasnprintf.c (modified) (14 diffs)
- sweep/branches/display-cache/intl/vasnprintf.h (modified) (4 diffs)
- sweep/branches/display-cache/intl/vasnwprintf.h (modified) (3 diffs)
- sweep/branches/display-cache/intl/wprintf-parse.h (modified) (2 diffs)
- sweep/branches/display-cache/intl/xsize.h (modified) (4 diffs)
- sweep/branches/display-cache/plugins/byenergy/byenergy.c (modified) (6 diffs)
- sweep/branches/display-cache/plugins/echo/echo.c (modified) (6 diffs)
- sweep/branches/display-cache/plugins/example/example.c (modified) (5 diffs)
- sweep/branches/display-cache/plugins/fade/fade.c (modified) (7 diffs)
- sweep/branches/display-cache/plugins/ladspa/ladspa.h (modified) (10 diffs)
- sweep/branches/display-cache/plugins/ladspa/ladspameta.c (modified) (24 diffs)
- sweep/branches/display-cache/plugins/normalise/normalise.c (modified) (4 diffs)
- sweep/branches/display-cache/plugins/reverse/reverse.c (modified) (8 diffs)
- sweep/branches/display-cache/po/fr.po (modified) (1 diff)
- sweep/branches/display-cache/po/pl.po (modified) (1 diff)
- sweep/branches/display-cache/src/about_dialog.c (modified) (3 diffs)
- sweep/branches/display-cache/src/about_dialog.h (modified) (1 diff)
- sweep/branches/display-cache/src/callbacks.c (modified) (81 diffs)
- sweep/branches/display-cache/src/callbacks.h (modified) (1 diff)
- sweep/branches/display-cache/src/channelops.c (modified) (35 diffs)
- sweep/branches/display-cache/src/channelops.h (modified) (1 diff)
- sweep/branches/display-cache/src/cursors.c (modified) (3 diffs)
- sweep/branches/display-cache/src/cursors.h (modified) (3 diffs)
- sweep/branches/display-cache/src/db_ruler.c (modified) (25 diffs)
- sweep/branches/display-cache/src/db_ruler.h (modified) (2 diffs)
- sweep/branches/display-cache/src/db_slider.c (modified) (12 diffs)
- sweep/branches/display-cache/src/db_slider.h (modified) (2 diffs)
- sweep/branches/display-cache/src/display-cache.c (modified) (3 diffs)
- sweep/branches/display-cache/src/display-cache.h (modified) (4 diffs)
- sweep/branches/display-cache/src/driver.c (modified) (22 diffs)
- sweep/branches/display-cache/src/driver.h (modified) (5 diffs)
- sweep/branches/display-cache/src/driver_alsa.c (modified) (20 diffs)
- sweep/branches/display-cache/src/driver_oss.c (modified) (18 diffs)
- sweep/branches/display-cache/src/driver_solaris.c (modified) (7 diffs)
- sweep/branches/display-cache/src/edit.c (modified) (84 diffs)
- sweep/branches/display-cache/src/edit.h (modified) (2 diffs)
- sweep/branches/display-cache/src/file_dialogs.c (modified) (29 diffs)
- sweep/branches/display-cache/src/file_dialogs.h (modified) (1 diff)
- sweep/branches/display-cache/src/file_mad.c (modified) (19 diffs)
- sweep/branches/display-cache/src/file_sndfile.h (modified) (1 diff)
- sweep/branches/display-cache/src/file_sndfile1.c (modified) (35 diffs)
- sweep/branches/display-cache/src/file_speex.c (modified) (90 diffs)
- sweep/branches/display-cache/src/file_vorbis.c (modified) (65 diffs)
- sweep/branches/display-cache/src/format.c (modified) (3 diffs)
- sweep/branches/display-cache/src/format.h (modified) (1 diff)
- sweep/branches/display-cache/src/head.c (modified) (45 diffs)
- sweep/branches/display-cache/src/head.h (modified) (1 diff)
- sweep/branches/display-cache/src/interface.c (modified) (15 diffs)
- sweep/branches/display-cache/src/interface.h (modified) (1 diff)
- sweep/branches/display-cache/src/levelmeter.c (modified) (12 diffs)
- sweep/branches/display-cache/src/levelmeter.h (modified) (3 diffs)
- sweep/branches/display-cache/src/main.c (modified) (7 diffs)
- sweep/branches/display-cache/src/notes.c (modified) (2 diffs)
- sweep/branches/display-cache/src/notes.h (modified) (1 diff)
- sweep/branches/display-cache/src/param.c (modified) (25 diffs)
- sweep/branches/display-cache/src/param.h (modified) (1 diff)
- sweep/branches/display-cache/src/paste_dialogs.c (modified) (15 diffs)
- sweep/branches/display-cache/src/paste_dialogs.h (modified) (1 diff)
- sweep/branches/display-cache/src/pcmio.h (modified) (1 diff)
- sweep/branches/display-cache/src/pixmaps.h (modified) (3 diffs)
- sweep/branches/display-cache/src/play.c (modified) (28 diffs)
- sweep/branches/display-cache/src/play.h (modified) (1 diff)
- sweep/branches/display-cache/src/plugin.c (modified) (4 diffs)
- sweep/branches/display-cache/src/plugin.h (modified) (1 diff)
- sweep/branches/display-cache/src/preferences.c (modified) (15 diffs)
- sweep/branches/display-cache/src/preferences.h (modified) (1 diff)
- sweep/branches/display-cache/src/print.c (modified) (4 diffs)
- sweep/branches/display-cache/src/print.h (modified) (1 diff)
- sweep/branches/display-cache/src/question_dialogs.c (modified) (12 diffs)
- sweep/branches/display-cache/src/question_dialogs.h (modified) (1 diff)
- sweep/branches/display-cache/src/record.c (modified) (20 diffs)
- sweep/branches/display-cache/src/record.h (modified) (1 diff)
- sweep/branches/display-cache/src/sample-display.c (modified) (68 diffs)
- sweep/branches/display-cache/src/sample-display.h (modified) (4 diffs)
- sweep/branches/display-cache/src/sample.c (modified) (19 diffs)
- sweep/branches/display-cache/src/sample.h (modified) (3 diffs)
- sweep/branches/display-cache/src/samplerate.c (modified) (36 diffs)
- sweep/branches/display-cache/src/scroll-pane.c (modified) (12 diffs)
- sweep/branches/display-cache/src/scroll-pane.h (modified) (3 diffs)
- sweep/branches/display-cache/src/sw_chooser.c (modified) (15 diffs)
- sweep/branches/display-cache/src/sw_chooser.h (modified) (2 diffs)
- sweep/branches/display-cache/src/sweep_app.h (modified) (11 diffs)
- sweep/branches/display-cache/src/sweep_filter.c (modified) (7 diffs)
- sweep/branches/display-cache/src/sweep_sample.c (modified) (102 diffs)
- sweep/branches/display-cache/src/sweep_selection.c (modified) (12 diffs)
- sweep/branches/display-cache/src/sweep_sounddata.c (modified) (14 diffs)
- sweep/branches/display-cache/src/sweep_typeconvert.c (modified) (4 diffs)
- sweep/branches/display-cache/src/sweep_undo.c (modified) (33 diffs)
- sweep/branches/display-cache/src/tdb/spinlock.c (modified) (6 diffs)
- sweep/branches/display-cache/src/tdb/spinlock.h (modified) (2 diffs)
- sweep/branches/display-cache/src/tdb/tdb.c (modified) (21 diffs)
- sweep/branches/display-cache/src/tdb/tdb.h (modified) (4 diffs)
- sweep/branches/display-cache/src/time_ruler.c (modified) (19 diffs)
- sweep/branches/display-cache/src/time_ruler.h (modified) (2 diffs)
- sweep/branches/display-cache/src/timeouts.c (modified) (6 diffs)
- sweep/branches/display-cache/src/undo_dialog.c (modified) (15 diffs)
- sweep/branches/display-cache/src/undo_dialog.h (modified) (1 diff)
- sweep/branches/display-cache/src/view.c (modified) (142 diffs)
- sweep/branches/display-cache/src/view.h (modified) (2 diffs)
- sweep/branches/display-cache/src/view_pixmaps.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
sweep/branches/display-cache/include/sweep/sweep.h
r124 r471 33 33 #include <sweep/sweep_filter.h> 34 34 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 26 26 sw_framecount_t nr_frames, 27 27 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);28 sw_op_instance *perform_filter_region_op (sw_sample * sample, char *desc, 29 SweepFilterRegion func, 30 sw_param_set pset, 31 gpointer custom_data); 32 32 33 sw_op_instance * 34 perform_filter_op (sw_sample * sample, char * desc, SweepFilter func,35 sw_param_set pset,gpointer custom_data);33 sw_op_instance *perform_filter_op (sw_sample * sample, char *desc, 34 SweepFilter func, sw_param_set pset, 35 gpointer custom_data); 36 36 37 37 sweep/branches/display-cache/include/sweep/sweep_sample.h
r124 r471 24 24 #include <sweep/sweep_types.h> 25 25 26 sw_sample * 27 sample_new_empty(char * pathname, gint nr_channels, gint sample_rate, 28 gint sample_length); 26 sw_sample *sample_new_empty (char *pathname, gint nr_channels, 27 gint sample_rate, gint sample_length); 29 28 30 sw_sample * 31 sample_new_copy(sw_sample * s); 29 sw_sample *sample_new_copy (sw_sample * s); 32 30 33 void 34 sample_destroy (sw_sample * s); 31 void sample_destroy (sw_sample * s); 35 32 36 sw_sounddata * 37 sample_get_sounddata (sw_sample * s); 33 sw_sounddata *sample_get_sounddata (sw_sample * s); 38 34 39 void 40 sample_set_file_format (sw_sample * s, sw_file_format_t file_format); 35 void sample_set_file_format (sw_sample * s, sw_file_format_t file_format); 41 36 42 void 43 sample_set_pathname (sw_sample * s, char * pathname); 37 void sample_set_pathname (sw_sample * s, char *pathname); 44 38 45 GList * 46 sample_bank_list_names (void); 39 GList *sample_bank_list_names (void); 47 40 48 sw_sample * 49 sample_bank_find_byname (const gchar * name); 41 sw_sample *sample_bank_find_byname (const gchar * name); 50 42 51 gboolean 52 sample_bank_contains (sw_sample *s); 43 gboolean sample_bank_contains (sw_sample * s); 53 44 54 void 55 sample_bank_add (sw_sample * s); 45 void sample_bank_add (sw_sample * s); 56 46 57 void 58 sample_bank_remove (sw_sample * s); 47 void sample_bank_remove (sw_sample * s); 59 48 60 void 61 sample_refresh_views (sw_sample * s); 49 void sample_refresh_views (sw_sample * s); 62 50 63 void 64 sample_start_marching_ants (sw_sample * s); 51 void sample_start_marching_ants (sw_sample * s); 65 52 66 void 67 sample_stop_marching_ants (sw_sample * s); 53 void sample_stop_marching_ants (sw_sample * s); 68 54 69 void 70 sample_set_edit_state (sw_sample * s, sw_edit_state edit_state); 55 void sample_set_edit_state (sw_sample * s, sw_edit_state edit_state); 71 56 72 void 73 sample_set_edit_mode (sw_sample * s, sw_edit_mode edit_mode); 57 void sample_set_edit_mode (sw_sample * s, sw_edit_mode edit_mode); 74 58 75 void 76 sample_refresh_playmode (sw_sample * s); 59 void sample_refresh_playmode (sw_sample * s); 77 60 78 void 79 sample_set_previewing (sw_sample * s, gboolean previewing); 61 void sample_set_previewing (sw_sample * s, gboolean previewing); 80 62 81 void 82 sample_set_stop_offset (sw_sample * s); 63 void sample_set_stop_offset (sw_sample * s); 83 64 84 65 void … … 86 67 gboolean by_user); 87 68 88 void 89 sample_set_rec_marker (sw_sample * s, sw_framecount_t offset); 69 void sample_set_rec_marker (sw_sample * s, sw_framecount_t offset); 90 70 91 void 92 sample_set_scrubbing (sw_sample * s, gboolean scrubbing); 71 void sample_set_scrubbing (sw_sample * s, gboolean scrubbing); 93 72 94 void 95 sample_set_looping (sw_sample * s, gboolean looping); 73 void sample_set_looping (sw_sample * s, gboolean looping); 96 74 97 void 98 sample_set_playrev (sw_sample * s, gboolean reverse); 75 void sample_set_playrev (sw_sample * s, gboolean reverse); 99 76 100 void 101 sample_set_mute (sw_sample * s, gboolean mute); 77 void sample_set_mute (sw_sample * s, gboolean mute); 102 78 103 void 104 sample_set_color (sw_sample * s, gint color); 79 void sample_set_color (sw_sample * s, gint color); 105 80 106 void 107 sample_set_progress_text (sw_sample * s, gchar * text); 81 void sample_set_progress_text (sw_sample * s, gchar * text); 108 82 109 void 110 sample_set_progress_percent (sw_sample * s, gint percent); 83 void sample_set_progress_percent (sw_sample * s, gint percent); 111 84 112 void 113 sample_refresh_progress_percent (sw_sample * s); 85 void sample_refresh_progress_percent (sw_sample * s); 114 86 115 int 116 sample_set_progress_ready (sw_sample * s); 87 int sample_set_progress_ready (sw_sample * s); 117 88 118 void 119 sample_set_tmp_message (sw_sample * s, const char * fmt, ...); 89 void sample_set_tmp_message (sw_sample * s, const char *fmt, ...); 120 90 121 91 /* … … 129 99 * 130 100 */ 131 void 132 sample_replace_throughout (sw_sample * os, sw_sample * s); 101 void sample_replace_throughout (sw_sample * os, sw_sample * s); 133 102 134 103 135 104 /* Selection handling */ 136 105 137 gboolean 138 sample_offset_in_sel (sw_sample * s, sw_framecount_t offset); 106 gboolean sample_offset_in_sel (sw_sample * s, sw_framecount_t offset); 139 107 140 guint 141 sample_sel_nr_regions (sw_sample * s); 108 guint sample_sel_nr_regions (sw_sample * s); 142 109 143 void 144 sample_clear_selection (sw_sample * s); 110 void sample_clear_selection (sw_sample * s); 145 111 146 void 147 sample_add_selection (sw_sample * s, sw_sel * sel); 112 void sample_add_selection (sw_sample * s, sw_sel * sel); 148 113 149 sw_sel * 150 sample_add_selection_1 (sw_sample * s, 151 sw_framecount_t start, sw_framecount_t end); 114 sw_sel *sample_add_selection_1 (sw_sample * s, 115 sw_framecount_t start, sw_framecount_t end); 152 116 153 void 154 sample_set_selection (sw_sample * s, GList * gl); 117 void sample_set_selection (sw_sample * s, GList * gl); 155 118 156 sw_sel * 157 sample_set_selection_1 (sw_sample * s, 158 sw_framecount_t start, sw_framecount_t end); 119 sw_sel *sample_set_selection_1 (sw_sample * s, 120 sw_framecount_t start, sw_framecount_t end); 159 121 160 122 … … 164 126 sw_framecount_t new_start, sw_framecount_t new_end); 165 127 166 void 167 sample_selection_invert (sw_sample * s); 128 void sample_selection_invert (sw_sample * s); 168 129 169 void 170 sample_selection_select_all (sw_sample * s); 130 void sample_selection_select_all (sw_sample * s); 171 131 172 void 173 sample_selection_select_none (sw_sample * s); 132 void sample_selection_select_none (sw_sample * s); 174 133 175 void 176 sample_selection_halve (sw_sample * s); 134 void sample_selection_halve (sw_sample * s); 177 135 178 void 179 sample_selection_double (sw_sample * s); 136 void sample_selection_double (sw_sample * s); 180 137 181 void 182 sample_selection_shift_left (sw_sample * s); 138 void sample_selection_shift_left (sw_sample * s); 183 139 184 void 185 sample_selection_shift_right (sw_sample * s); 140 void sample_selection_shift_right (sw_sample * s); 186 141 187 142 /* info dialog */ 188 void 189 sample_show_info_dialog (sw_sample * sample); 143 void sample_show_info_dialog (sw_sample * sample); 190 144 191 145 sweep/branches/display-cache/include/sweep/sweep_selection.h
r124 r471 22 22 #define __SWEEP_SELECTION_H__ 23 23 24 sw_sel * 25 sel_new (sw_framecount_t start, sw_framecount_t end); 24 sw_sel *sel_new (sw_framecount_t start, sw_framecount_t end); 26 25 27 sw_sel * 28 sel_copy (sw_sel * sel); 26 sw_sel *sel_copy (sw_sel * sel); 29 27 30 GList * 31 sels_add_selection (GList * sels, sw_sel * sel); 28 GList *sels_add_selection (GList * sels, sw_sel * sel); 32 29 33 GList * 34 sels_add_selection_1 (GList * sels, sw_framecount_t start,sw_framecount_t end);30 GList *sels_add_selection_1 (GList * sels, sw_framecount_t start, 31 sw_framecount_t end); 35 32 36 33 /* … … 40 37 * return > 0 if s1 comes after s2 in the sort order. 41 38 */ 42 gint 43 sel_cmp (sw_sel * s1, sw_sel * s2); 39 gint sel_cmp (sw_sel * s1, sw_sel * s2); 44 40 45 41 /* … … 48 44 * returns a copy of sels 49 45 */ 50 GList * 51 sels_copy (GList * sels); 46 GList *sels_copy (GList * sels); 52 47 53 48 /* … … 56 51 * inverts sels in place 57 52 */ 58 GList * 59 sels_invert (GList * sels, sw_framecount_t nr_frames); 53 GList *sels_invert (GList * sels, sw_framecount_t nr_frames); 60 54 61 sw_op_instance * 62 perform_selection_op (sw_sample * s, char * desc, SweepFilter func,63 sw_param_set pset,gpointer custom_data);55 sw_op_instance *perform_selection_op (sw_sample * s, char *desc, 56 SweepFilter func, sw_param_set pset, 57 gpointer custom_data); 64 58 65 59 #endif /* __SWEEP_SELECTION_H__ */ sweep/branches/display-cache/include/sweep/sweep_sounddata.h
r124 r471 22 22 #define __SWEEP_SOUNDDATA_H__ 23 23 24 sw_sounddata * 25 sounddata_new_empty(gint nr_channels, gint sample_rate,gint sample_length);24 sw_sounddata *sounddata_new_empty (gint nr_channels, gint sample_rate, 25 gint sample_length); 26 26 27 void 28 sounddata_destroy (sw_sounddata * sounddata); 27 void sounddata_destroy (sw_sounddata * sounddata); 29 28 30 void 31 sounddata_lock_selection (sw_sounddata * sounddata); 29 void sounddata_lock_selection (sw_sounddata * sounddata); 32 30 33 void 34 sounddata_unlock_selection (sw_sounddata * sounddata); 31 void sounddata_unlock_selection (sw_sounddata * sounddata); 35 32 36 void 37 sounddata_clear_selection (sw_sounddata * sounddata); 33 void sounddata_clear_selection (sw_sounddata * sounddata); 38 34 39 35 /* … … 44 40 */ 45 41 46 void 47 sounddata_normalise_selection (sw_sounddata * sounddata); 42 void sounddata_normalise_selection (sw_sounddata * sounddata); 48 43 49 void 50 sounddata_add_selection (sw_sounddata * sounddata, sw_sel * sel); 44 void sounddata_add_selection (sw_sounddata * sounddata, sw_sel * sel); 51 45 52 sw_sel * 53 sounddata_add_selection_1 (sw_sounddata * sounddata,54 sw_framecount_t start,sw_framecount_t end);46 sw_sel *sounddata_add_selection_1 (sw_sounddata * sounddata, 47 sw_framecount_t start, 48 sw_framecount_t end); 55 49 56 sw_sel * 57 sounddata_set_selection_1 (sw_sounddata * sounddata,58 sw_framecount_t start,sw_framecount_t end);50 sw_sel *sounddata_set_selection_1 (sw_sounddata * sounddata, 51 sw_framecount_t start, 52 sw_framecount_t end); 59 53 60 guint 61 sounddata_selection_nr_regions (sw_sounddata * sounddata); 54 guint sounddata_selection_nr_regions (sw_sounddata * sounddata); 62 55 63 gint 64 sounddata_selection_nr_frames (sw_sounddata * sounddata); 56 gint sounddata_selection_nr_frames (sw_sounddata * sounddata); 65 57 66 gint 67 sounddata_selection_width (sw_sounddata * sounddata); 58 gint sounddata_selection_width (sw_sounddata * sounddata); 68 59 69 void 70 sounddata_selection_translate (sw_sounddata * sounddata, gint delta); 60 void sounddata_selection_translate (sw_sounddata * sounddata, gint delta); 71 61 72 void 73 sounddata_selection_scale (sw_sounddata * sounddata, gfloat scale); 62 void sounddata_selection_scale (sw_sounddata * sounddata, gfloat scale); 74 63 75 64 /* sweep/branches/display-cache/include/sweep/sweep_typeconvert.h
r57 r471 26 26 * in a given format. 27 27 */ 28 glong 29 frames_to_samples (sw_format * format, sw_framecount_t nr_frames); 28 glong frames_to_samples (sw_format * format, sw_framecount_t nr_frames); 30 29 31 30 /* 32 31 * Determine the size in bytes of a number of frames of a given format. 33 32 */ 34 glong 35 frames_to_bytes (sw_format * format, sw_framecount_t nr_frames); 33 glong frames_to_bytes (sw_format * format, sw_framecount_t nr_frames); 36 34 37 35 /* 38 36 * Convert a number of frames to seconds 39 37 */ 40 sw_time_t 41 frames_to_time (sw_format * format, sw_framecount_t nr_frames); 38 sw_time_t frames_to_time (sw_format * format, sw_framecount_t nr_frames); 42 39 43 40 /* 44 41 * Convert seconds to frames 45 42 */ 46 sw_framecount_t 47 time_to_frames (sw_format * format, sw_time_t time); 43 sw_framecount_t time_to_frames (sw_format * format, sw_time_t time); 48 44 49 45 #endif /* __SWEEP_TYPE_CONVERT_H__ */ sweep/branches/display-cache/include/sweep/sweep_types.h
r304 r471 23 23 24 24 #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 */ 27 27 28 28 #include <sys/types.h> … … 54 54 #if 0 55 55 56 #if (SIZEOF_OFF_T == 8) 56 #if (SIZEOF_OFF_T == 8) 57 57 /* For libsndfile version 1 */ 58 58 typedef off_t sw_framecount_t; … … 90 90 * 91 91 */ 92 struct _sw_sel { 92 struct _sw_sel 93 { 93 94 sw_framecount_t sel_start; 94 95 sw_framecount_t sel_end; … … 100 101 * Multichannel data is interleaved: Stereo is stored LR. 101 102 */ 102 struct _sw_format { 103 gint channels; /* nr channels per frame */ 104 gint rate; /* sampling rate (Hz) */ 105 }; 106 107 struct _sw_sounddata { 103 struct _sw_format 104 { 105 gint channels; /* nr channels per frame */ 106 gint rate; /* sampling rate (Hz) */ 107 }; 108 109 struct _sw_sounddata 110 { 108 111 int refcount; 109 112 110 sw_format * format;111 sw_framecount_t nr_frames; /* nr frames */113 sw_format *format; 114 sw_framecount_t nr_frames; /* nr frames */ 112 115 113 116 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 */ 118 121 }; 119 122 … … 121 124 122 125 123 typedef enum { 126 typedef enum 127 { 124 128 SWEEP_EDIT_MODE_READY, 125 SWEEP_EDIT_MODE_META, /* modifying metadata: sels etc. */129 SWEEP_EDIT_MODE_META, /* modifying metadata: sels etc. */ 126 130 SWEEP_EDIT_MODE_FILTER, 127 131 SWEEP_EDIT_MODE_ALLOC, 128 132 } sw_edit_mode; 129 133 130 typedef enum { 134 typedef enum 135 { 131 136 SWEEP_EDIT_STATE_IDLE, 132 137 SWEEP_EDIT_STATE_PENDING, … … 136 141 } sw_edit_state; 137 142 138 typedef enum { 143 typedef enum 144 { 139 145 SWEEP_TRANSPORT_STOP, 140 146 SWEEP_TRANSPORT_PLAY, … … 143 149 144 150 /* File formats */ 145 typedef enum { 146 SWEEP_FILE_FORMAT_NONE=0, 147 SWEEP_FILE_FORMAT_BY_EXTENSION=0, 151 typedef enum 152 { 153 SWEEP_FILE_FORMAT_NONE = 0, 154 SWEEP_FILE_FORMAT_BY_EXTENSION = 0, 148 155 SWEEP_FILE_FORMAT_RAW, 149 156 SWEEP_FILE_FORMAT_WAV, … … 165 172 * The length of data available *data is (end - start) 166 173 */ 167 struct _sw_edit_region { 174 struct _sw_edit_region 175 { 168 176 sw_framecount_t start; 169 177 sw_framecount_t end; … … 172 180 }; 173 181 174 struct _sw_edit_buffer { 175 sw_format * format; 176 GList * regions; 182 struct _sw_edit_buffer 183 { 184 sw_format *format; 185 GList *regions; 177 186 gint refcount; 178 187 }; … … 186 195 typedef struct _sw_op_instance sw_op_instance; 187 196 188 struct _sw_operation { 197 struct _sw_operation 198 { 189 199 sw_edit_mode edit_mode; 190 200 SweepCallback _do_; … … 196 206 }; 197 207 198 struct _sw_op_instance { 199 sw_sample * sample; 200 char * description; 201 sw_operation * op; 208 struct _sw_op_instance 209 { 210 sw_sample *sample; 211 char *description; 212 sw_operation *op; 202 213 gpointer do_data; 203 214 gpointer undo_data; … … 208 219 * Basic types for parameters 209 220 */ 210 typedef enum { 221 typedef enum 222 { 211 223 SWEEP_TYPE_BOOL = 0, 212 224 SWEEP_TYPE_INT, … … 218 230 typedef gint sw_int; 219 231 typedef gdouble sw_float; 220 typedef gchar * sw_string;232 typedef gchar *sw_string; 221 233 222 234 … … 225 237 */ 226 238 typedef union _sw_param sw_param; 227 typedef sw_param * sw_param_set; 228 229 union _sw_param { 239 typedef sw_param *sw_param_set; 240 241 union _sw_param 242 { 230 243 sw_bool b; 231 sw_int i;244 sw_int i; 232 245 sw_float f; 233 246 sw_string s; … … 243 256 * the usage of the sw_constraint. 244 257 */ 245 typedef enum { 258 typedef enum 259 { 246 260 /* 247 261 * SW_PARAM_CONSTRAINED_NOT indicates that the parameter is completely … … 253 267 * How free is its life, how wretched its lot! 254 268 */ 255 SW_PARAM_CONSTRAINED_NOT =0,269 SW_PARAM_CONSTRAINED_NOT = 0, 256 270 257 271 /* … … 303 317 #define SW_RANGE_STEP_VALID (1<<2) 304 318 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) 306 320 307 321 /* … … 335 349 */ 336 350 #define SW_PARAM_HINT_FILENAME (1<<3) 337 351 338 352 339 353 typedef struct _sw_param_spec sw_param_spec; … … 355 369 * string parameters. 356 370 */ 357 struct _sw_param_range { 371 struct _sw_param_range 372 { 358 373 int valid_mask; 359 374 sw_param lower; … … 369 384 * All constraints are disregarded for boolean parameters. 370 385 */ 371 union _sw_constraint { 386 union _sw_constraint 387 { 372 388 /* 373 389 * param_list: Values are constrained to those within a list of … … 376 392 * ie. this length = constraint->param_list[0].i 377 393 */ 378 sw_param * list;394 sw_param *list; 379 395 380 396 /* 381 397 * param_range, as described above. 382 398 */ 383 sw_param_range * range;/* param range */399 sw_param_range *range; /* param range */ 384 400 }; 385 401 … … 388 404 * sw_param_spec: specification for a parameter. 389 405 */ 390 struct _sw_param_spec { 406 struct _sw_param_spec 407 { 391 408 /* A short name for this parameter */ 392 gchar * name;409 gchar *name; 393 410 394 411 /* A longer description of the parameter's purpose and usage */ 395 gchar * desc;412 gchar *desc; 396 413 397 414 /* The type of the parameter */ … … 414 431 typedef struct _sw_plugin sw_plugin; 415 432 416 struct _sw_procedure { 417 gchar * name; 418 gchar * description; 419 gchar * author; 420 gchar * copyright; 421 gchar * url; 422 423 gchar * identifier; 433 struct _sw_procedure 434 { 435 gchar *name; 436 gchar *description; 437 gchar *author; 438 gchar *copyright; 439 gchar *url; 440 441 gchar *identifier; 424 442 425 443 /* Key bindings */ … … 428 446 429 447 gint nr_params; 430 sw_param_spec * param_specs;448 sw_param_spec *param_specs; 431 449 432 450 /* suggest sets suggested values for the members of pset, … … 446 464 * If nr_params is 0 then this function will be passed a NULL pset. 447 465 */ 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); 450 468 451 469 /* custom data to pass to the suggest and apply functions */ … … 453 471 }; 454 472 455 struct _sw_plugin { 473 struct _sw_plugin 474 { 456 475 /* plugin_init () returns a list of procedures */ 457 GList * (*plugin_init) (void);476 GList *(*plugin_init) (void); 458 477 459 478 /* plugin_cleanup() frees the plugin's private data structures */ … … 461 480 }; 462 481 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 482 typedef 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 24 24 #include "sweep_types.h" 25 25 <
