Changeset 22002 for lang/perl/Music-AutoPhrase

Timestamp:

10/24/08 01:28:26 (5 years ago)

Author:

bonar

Message:

lang/perl/Music-AutoPhrase?; add NoteSelector?

Location:

lang/perl/Music-AutoPhrase/trunk

Files:

• lib/Music/AutoPhrase/BeatPattern.pm (modified) (1 diff)
• lib/Music/AutoPhrase/Channel.pm (modified) (5 diffs)
• lib/Music/AutoPhrase/NoteSelector.pm (added)
• t/12_channel.t (added)
• t/13_selector_base.t (added)

lang/perl/Music-AutoPhrase/trunk/lib/Music/AutoPhrase/BeatPattern.pm

@@ -17 +17 @@
     BEAT_CHAR_ON_REGEXP  => '(1|2|3|4|9)',
 };
+
+use base 'Exporter';
+our @EXPORT = qw/
+    BEAT_STRING_LENGTH
+/;
 
 sub new {

lang/perl/Music-AutoPhrase/trunk/lib/Music/AutoPhrase/Channel.pm

@@ -6 +6 @@
 
 use List::MoreUtils qw/uniq/;
+use Music::AutoPhrase::BeatPattern;
 
 use base 'Class::Accessor::Fast';
@@ -11 +12 @@
     inst
     vol
-    octav_range
-    blocks
-    selector
+    _beats
+    _octav_range
+    _selector
 /);
 
@@ -19 +20 @@
     MIN_OCTAV => 1,
     MAX_OCTAV => 8,
+
+    DEFAULT_INST => 1,
+    DEFAULT_VOL  => 80,
+    DEFAULT_OCTAV_RANGE => [qw/4 5 6/],
 };
+
+sub new {
+    my ($class, %arg) = @_;
+
+    my $self = {};
+    bless $self, $class;
+
+    # set params and defaults
+    $self->inst($arg{inst} || DEFAULT_INST);
+    $self->vol($arg{vol} || DEFAULT_VOL);
+    $self->octav($arg{octav} || DEFAULT_OCTAV_RANGE);
+    $self->_beats([]);
+
+    return $self;
+}
 
 sub push_block {
@@ -29 +49 @@
         return;
     }
-    my $bl = $self->blocks;
+    my $bl = $self->beats;
     push @$bl, $block;
+    $bl->beats($block);
 }
 
-sub set_octav_range {
+sub octav {
     my ($self, $range) = @_;
+    return $self->_octav_range if !defined $range;
 
-    if (!defined $range || ref($range) ne 'ARRAY') {
+    if (!ref($range) && $range =~ /^[1-8]$/) {
+        $range = [qw/$range/];
+    }
+    if (ref($range) ne 'ARRAY') {
         warn "range must be arrayref";
         return;
@@ -51 +76 @@
         push @selected_octav, $octav;
     }
-    $self->octav_range(\@selected_octav);
+    $self->_octav_range(\@selected_octav);
 }
 
+sub _push {
+    my ($self, $bp) = @_;
+
+    if (!ref($bp) && length($bp) == BEAT_STRING_LENGTH) {
+        $bp = Music::AutoPhrase::BeatPattern->new($bp);
+    }
+    if (!ref($bp) || !$bp->isa('Music::AutoPhrase::BeatPattern')) {
+        warn "beat patter [$bp] musct be a BeatPattern object";
+        return;
+    }
+
+    my $beats = $self->_beats;
+    push @$beats, $bp;
+    $self->_beats($beats);
+}
+
+sub push {
+    my ($self, @beats) = @_;
+    $self->_push($_) for @beats;
+}
+
+sub beats {
+    return @{$_[0]->_beats()};
+}
+
+sub selector {
+
+}
 
 1;