Skip to content

Commit 77af5fe

Browse files
committed
Clean up of spectro code
1 parent 1c38b70 commit 77af5fe

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

code_listings/sdl_mixer_spectro.pl

+7-13
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@
5252

5353
my $music_is_playing :shared = 0;
5454
sub callback{
55-
5655
$music_is_playing = 0;
57-
58-
warn "Going to next song \n"
5956
};
6057

6158

@@ -70,16 +67,17 @@ sub callback{
7067
my $stream : shared;
7168
my $quit_processing : shared = 0;
7269

70+
my $effect_id =
71+
SDL::Mixer::Effects::register( MIX_CHANNEL_POST, "main::spiffy",
72+
"main::spiffydone", 0 );
73+
74+
7375
foreach (@songs) {
7476
warn 'Playing ' . $_;
7577

7678
my $song = SDL::Mixer::Music::load_MUS($_);
7779
SDL::Mixer::Music::hook_music_finished('main::callback');
7880
SDL::Mixer::Music::play_music( $song, 0 );
79-
my $effect_id =
80-
SDL::Mixer::Effects::register( MIX_CHANNEL_POST, "main::spiffy",
81-
"main::spiffydone", 0 );
82-
8381
$music_is_playing = 1;
8482

8583
while ($music_is_playing) {
@@ -108,9 +106,9 @@ sub callback{
108106

109107
}
110108

111-
SDL::Mixer::Effects::unregister( MIX_CHANNEL_POST, $effect_id );
112109

113110
}
111+
SDL::Mixer::Effects::unregister( MIX_CHANNEL_POST, $effect_id );
114112

115113
SDL::Mixer::Music::hook_music_finished();
116114
join_threads();
@@ -146,7 +144,6 @@ sub process_stream {
146144
$stream = '';
147145
my @left;
148146
my @right;
149-
# warn ' stream is '.$#stream_cut;
150147
my $cut = $#stream_cut/$lines;
151148
my @x;
152149
my @left_bezier;
@@ -165,8 +162,6 @@ sub process_stream {
165162
my $point_x = ( $i / $#stream_cut ) * 800;
166163

167164

168-
# print int($point_y) .'|'. int($point_x)."\n";
169-
170165
push @x, $point_x;
171166
push @left_bezier, $point_y;
172167

@@ -175,8 +170,7 @@ sub process_stream {
175170

176171
}
177172

178-
#SDL::GFX::Primitives::bezier_color($app, \@x, \@left_bezier, $#left_bezier, 30, 0xFF0000FF);
179-
$stream_update = 0;
173+
$stream_update = 0;
180174
SDL::Video::flip($app);
181175
}
182176
else {

data/music/00-sample.ogg

-6.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)