?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Dash:
[t2-trunk.git] / package / audio / mixmagic / pitch.patch
blob3078aaef67d4afd41bf7c8188c62ff4a7f13468a
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../mixmagic/pitch.patch
5 # Copyright (C) 2004 - 2005 The T2 SDE Project
6 # Copyright (C) 1998 - 2003 ROCK Linux Project
7 #
8 # More information can be found in the files COPYING and README.
9 #
10 # This patch file is dual-licensed. It is available under the license the
11 # patched project is licensed under, as long as it is an OpenSource license
12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
13 # of the GNU General Public License as published by the Free Software
14 # Foundation; either version 2 of the License, or (at your option) any later
15 # version.
16 # --- T2-COPYRIGHT-NOTE-END ---
17
18
19 This patch adds pitch shifting to mixmagic. (by Clifford)
20
21 --- ./src/block.c.orig Sat Mar 9 11:06:32 2002
22 +++ ./src/block.c Mon May 13 20:16:56 2002
23 @@ -834,6 +834,7 @@
24
25 b->start = block->start + MIN (block->selection_start, block->selection_end);
26 b->length = ABS (block->selection_start - block->selection_end);
27 + block->length_unpitched = block->length * block->pitch;
28 b->sample = sample_ref (block->sample);
29 b->position = block->position + MIN (block->selection_start, block->selection_end);
30
31 @@ -1143,6 +1144,8 @@
32 newBlock->sample = sample_ref (block->sample);
33 newBlock->start = block->start;
34 newBlock->length = block->length;
35 + newBlock->length_unpitched = block->length_unpitched;
36 + newBlock->pitch = block->pitch;
37
38 /* Position it on the same place as the popup menu */
39 newBlock->position = block->position;
40 @@ -1183,8 +1186,8 @@
41 block_draw (Block *block)
42 {
43 gint i, width, height;
44 - gint offset, value;
45 - GString * start_gs , * len_gs ;
46 + gint offset, offset_start, value;
47 + GString * start_gs , * len_gs , * pitch_gs;
48
49 g_assert (IS_BLOCK(block));
50
51 @@ -1210,11 +1213,13 @@
52 width,
53 height);
54
55 - offset = block->start / INDEX_RATIO;
56 + offset_start = block->start / INDEX_RATIO;
57 + offset = 0;
58
59 for (i = 0; i < width;i++) {
60 value = index_get_average (block->sample->index,
61 - offset, block->start / INDEX_RATIO,
62 + offset_start + offset * block->pitch,
63 + block->start / INDEX_RATIO,
64 block->track->song->x_scale / INDEX_RATIO,
65 block->sample->length / INDEX_RATIO / 2) / ((float)0x7f / height);
66 gdk_draw_line (block->pixmap,
67 @@ -1254,13 +1259,42 @@
68
69 /* Draw title */
70
71 + gdk_draw_text (block->pixmap,
72 + GTK_WIDGET(block)->style->font,
73 + GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
74 + 10, 15,
75 + "F:",
76 + 2);
77 +
78 gdk_draw_text (block->pixmap,
79 GTK_WIDGET(block)->style->font,
80 GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
81 - 0, 10,
82 + 25, 15,
83 block->sample->id,
84 strlen (block->sample->id));
85
86 + /* Draw Pitch Value */
87 +
88 + pitch_gs = g_string_sized_new(20);
89 +
90 + pitch_gs->len = g_snprintf(pitch_gs->str, 20, "%c%02d.%02d %%",
91 + block->pitch == 0 ? '0' : (block->pitch > 0 ? '+' : '-'),
92 + abs(block->pitch*10000 - 10000) / 100,
93 + abs(block->pitch*10000 - 10000) % 100);
94 +
95 + gdk_draw_text (block->pixmap,
96 + GTK_WIDGET(block)->style->font,
97 + GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
98 + 10, 30,
99 + "P:",
100 + 2);
101 +
102 + gdk_draw_text (block->pixmap,
103 + GTK_WIDGET(block)->style->font,
104 + GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
105 + 25, 30,
106 + pitch_gs->str,
107 + pitch_gs->len);
108
109 /* Draw start time */
110
111 @@ -1281,14 +1315,14 @@
112 gdk_draw_text (block->pixmap,
113 GTK_WIDGET(block)->style->font,
114 GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
115 - 0, height - 20,
116 + 10, height - 20,
117 "S:",
118 2);
119
120 gdk_draw_text (block->pixmap,
121 GTK_WIDGET(block)->style->font,
122 GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
123 - 15, height - 20,
124 + 25, height - 20,
125 start_gs->str,
126 start_gs->len);
127
128 @@ -1313,14 +1347,14 @@
129 gdk_draw_text (block->pixmap,
130 GTK_WIDGET(block)->style->font,
131 GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
132 - 0, height - 5,
133 + 10, height - 5,
134 "L:",
135 2);
136
137 gdk_draw_text (block->pixmap,
138 GTK_WIDGET(block)->style->font,
139 GTK_WIDGET(block)->style->fg_gc[GTK_WIDGET(block)->state],
140 - 15, height - 5,
141 + 25, height - 5,
142 len_gs->str,
143 len_gs->len);
144
145 @@ -1481,6 +1515,73 @@
146 gtk_widget_draw (GTK_WIDGET (block), NULL);
147 }
148
149 +static void block_set_pitch (GtkWidget *widget, Block *block, gfloat newpitch) {
150 + block->pitch = newpitch;
151 + block->length = block->length_unpitched / newpitch;
152 + block_update (block);
153 + song_set_dirty (block->track->song, TRUE);
154 +}
155 +
156 +static void block_dec_pitch_1 (GtkWidget *widget, Block *block)
157 + { block_set_pitch (widget, block, block->pitch - 0.0001); }
158 +
159 +static void block_dec_pitch_3 (GtkWidget *widget, Block *block)
160 + { block_set_pitch (widget, block, block->pitch - 0.0003); }
161 +
162 +static void block_dec_pitch_5 (GtkWidget *widget, Block *block)
163 + { block_set_pitch (widget, block, block->pitch - 0.0005); }
164 +
165 +static void block_dec_pitch_10 (GtkWidget *widget, Block *block)
166 + { block_set_pitch (widget, block, block->pitch - 0.0010); }
167 +
168 +static void block_dec_pitch_30 (GtkWidget *widget, Block *block)
169 + { block_set_pitch (widget, block, block->pitch - 0.0030); }
170 +
171 +static void block_dec_pitch_50 (GtkWidget *widget, Block *block)
172 + { block_set_pitch (widget, block, block->pitch - 0.0050); }
173 +
174 +static void block_dec_pitch_100 (GtkWidget *widget, Block *block)
175 + { block_set_pitch (widget, block, block->pitch - 0.0100); }
176 +
177 +static void block_dec_pitch_300 (GtkWidget *widget, Block *block)
178 + { block_set_pitch (widget, block, block->pitch - 0.0300); }
179 +
180 +static void block_dec_pitch_500 (GtkWidget *widget, Block *block)
181 + { block_set_pitch (widget, block, block->pitch - 0.0500); }
182 +
183 +
184 +static void block_pitch_reset (GtkWidget *widget, Block *block)
185 + { block_set_pitch (widget, block, 1); }
186 +
187 +
188 +static void block_inc_pitch_1 (GtkWidget *widget, Block *block)
189 + { block_set_pitch (widget, block, block->pitch + 0.0001); }
190 +
191 +static void block_inc_pitch_3 (GtkWidget *widget, Block *block)
192 + { block_set_pitch (widget, block, block->pitch + 0.0003); }
193 +
194 +static void block_inc_pitch_5 (GtkWidget *widget, Block *block)
195 + { block_set_pitch (widget, block, block->pitch + 0.0005); }
196 +
197 +static void block_inc_pitch_10 (GtkWidget *widget, Block *block)
198 + { block_set_pitch (widget, block, block->pitch + 0.0010); }
199 +
200 +static void block_inc_pitch_30 (GtkWidget *widget, Block *block)
201 + { block_set_pitch (widget, block, block->pitch + 0.0030); }
202 +
203 +static void block_inc_pitch_50 (GtkWidget *widget, Block *block)
204 + { block_set_pitch (widget, block, block->pitch + 0.0050); }
205 +
206 +static void block_inc_pitch_100 (GtkWidget *widget, Block *block)
207 + { block_set_pitch (widget, block, block->pitch + 0.0100); }
208 +
209 +static void block_inc_pitch_300 (GtkWidget *widget, Block *block)
210 + { block_set_pitch (widget, block, block->pitch + 0.0300); }
211 +
212 +static void block_inc_pitch_500 (GtkWidget *widget, Block *block)
213 + { block_set_pitch (widget, block, block->pitch + 0.0500); }
214 +
215 +
216 static void
217 block_select_all (GtkWidget *widget, Block *block)
218 {
219 @@ -1534,6 +1635,26 @@
220 GNOMEUIINFO_SEPARATOR,
221 GNOMEUIINFO_ITEM_NONE (N_("Convert to loopblock"), N_("Convert to loopblock"), block_convert_to_loopblock),
222 GNOMEUIINFO_SEPARATOR,
223 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -5.00"), N_(""), block_dec_pitch_500),
224 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -3.00"), N_(""), block_dec_pitch_300),
225 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -1.00"), N_(""), block_dec_pitch_100),
226 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.50"), N_(""), block_dec_pitch_50),
227 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.30"), N_(""), block_dec_pitch_30),
228 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.10"), N_(""), block_dec_pitch_10),
229 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.05"), N_(""), block_dec_pitch_5),
230 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.03"), N_(""), block_dec_pitch_3),
231 + GNOMEUIINFO_ITEM_NONE (N_("Pitch -0.01"), N_(""), block_dec_pitch_1),
232 + GNOMEUIINFO_ITEM_NONE (N_("Reset Pitch"), N_(""), block_pitch_reset),
233 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.01"), N_(""), block_inc_pitch_1),
234 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.03"), N_(""), block_inc_pitch_3),
235 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.05"), N_(""), block_inc_pitch_5),
236 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.10"), N_(""), block_inc_pitch_10),
237 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.30"), N_(""), block_inc_pitch_30),
238 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +0.50"), N_(""), block_inc_pitch_50),
239 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +1.00"), N_(""), block_inc_pitch_100),
240 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +3.00"), N_(""), block_inc_pitch_300),
241 + GNOMEUIINFO_ITEM_NONE (N_("Pitch +5.00"), N_(""), block_inc_pitch_500),
242 + GNOMEUIINFO_SEPARATOR,
243 GNOMEUIINFO_ITEM_NONE (N_("Select all"), N_("Make the selection cover the whole block"), block_select_all),
244 GNOMEUIINFO_END
245 };
246 @@ -1640,24 +1761,30 @@
247 mix_into_buffer (Block *block, gint16 *buffer, gint position, gint length)
248 {
249 gint16 *data;
250 - gint i;
251 + gint i, data_offset, data_xoffset;
252
253 - data = (gint16 *)(block->sample->data +
254 - (block->start + position - block->position) * block->sample->byte_p_spl);
255 -
256 - for (i = 0;i < length / (sizeof (guint16) * 2);i++) {
257 + data = (gint16 *)(block->sample->data +
258 + (block->start - block->position) *
259 + block->sample->byte_p_spl);
260 + data_offset = position;
261 +
262 + for (i = 0; i < length / (sizeof (guint16) * 2); i++) {
263 +
264 + data_xoffset = data_offset * block->pitch;
265 + data_xoffset *= block->sample->num_channels;
266
267 mixer_mix_sample_into_buffer (buffer,
268 - data,
269 + data + data_xoffset,
270 block->amp_env,
271 block->pan_env,
272 block->track->amp,
273 block->track->pan,
274 - position - block->position + i, block->sample->num_channels);
275 + position - block->position + i,
276 + block->sample->num_channels);
277
278 - data += block->sample->num_channels;
279 + data_offset++;
280 buffer += 2;
281 }
282 }
283
284 /*
285 @@ -1675,8 +1813,11 @@
286
287 block->start = atoi ((ptr = xmlGetProp (node, "start")));
288 g_free (ptr);
289 - block->length = atoi ((ptr = xmlGetProp (node, "length")));
290 + block->length_unpitched = atoi ((ptr = xmlGetProp (node, "length")));
291 g_free (ptr);
292 + block->pitch = (float)atoi ((ptr = xmlGetProp (node, "pitch"))) / 10000;
293 + g_free (ptr);
294 + block->length = (float)block->length_unpitched * block->pitch;
295 block->position = atoi ((ptr = xmlGetProp (node, "position")));
296 g_free (ptr);
297 ptr = xmlGetProp (node, "sample");
298 --- ./src/track.c.orig Tue Mar 12 06:39:42 2002
299 +++ ./src/track.c Mon Mar 11 20:53:32 2002
300 @@ -328,6 +328,8 @@
301
302 block->start = 0;
303 block->length = sample_get_length(block->sample);
304 + block->length_unpitched = sample_get_length(block->sample);
305 + block->pitch=1;
306
307 /* Position it on the same place as the popup menu */
308 block->position = (x + (gint)(GTK_LAYOUT (track->layout)->hadjustment->value)) * track->song->x_scale;
309 --- ./src/block.h.orig Mon Mar 11 20:47:57 2002
310 +++ ./src/block.h Mon Mar 11 20:37:16 2002
311 @@ -89,6 +89,9 @@
312 gint length; /* The length of this block */
313 gint position; /* Position in time */
314
315 + gfloat pitch; /* Pitch shifting (in %) */
316 + gint length_unpitched; /* The length before pitch is applied */
317 +
318 Sample *sample; /* The sample assosiated with this block */
319
320 GList *amp_env; /* Pointer to this blocks amplitude envelope or NULL */
t2sde - trunk