# print "DIRENTS: FILE: $self->{path}\n";
if($state==$STATE_ALL)
{
- @dents=($PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
{
@dents=qw(AND OR);
}
- push(@dents, ($ENABLE_FILTER ?
- $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST) :
- ($PATH_ALLTRACKS, $PATH_NOARTIST)));
- push(@dents, $self->artists());
+ push(@dents, $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
}
}
elsif($state==$STATE_BOOLEAN)
}
elsif($state==$STATE_ALBUMS)
{
- @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOALBUM), $self->albums());
+ @dents=$self->filter($PATH_ALLTRACKS, $PATH_NOALBUM, $self->albums());
}
elsif($state==$STATE_TRACKLIST)
{
sub filter
{
my($self, @dirs)=@_;
+ return(@dirs) unless($ENABLE_FILTER);
my $base=$self->{path};
my @outdirs=();
for my $dir (@dirs)