MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-30 17:23:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add bpm keyword to smart playlists

Browse Source
This commit is contained in:
Ron Pedde 2004-09-08 03:58:33 +00:00
parent 5748b6502d
commit 84d1ee1cca
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/mt-daapd.playlist
View File

@ -21,6 +21,7 @@
# Conductor (string) # Conductor (string)
# Grouping (string) -- I don't even know what this is... # Grouping (string) -- I don't even know what this is...
# Year (int) # Year (int)
# BPM (int)
# #
# Valid operators include: # Valid operators include:
# is, includes (string) # is, includes (string)

1
src/lexer.l
View File

@ -52,6 +52,7 @@ conductor { yylval.ival=CONDUCTOR; return(CONDUCTOR); }
grouping { yylval.ival=GROUPING; return(GROUPING); } grouping { yylval.ival=GROUPING; return(GROUPING); }
year { yylval.ival=YEAR; return(YEAR); } year { yylval.ival=YEAR; return(YEAR); }
bpm { yylval.ival=BPM; return(BPM); }
is { yylval.ival=IS; return(IS); } is { yylval.ival=IS; return(IS); }
includes { yylval.ival=INCLUDES; return(INCLUDES); } includes { yylval.ival=INCLUDES; return(INCLUDES); }

2
src/parser.y
View File

@ -78,6 +78,7 @@ int pl_number=2;
%token <ival> NUM %token <ival> NUM
%token <ival> YEAR %token <ival> YEAR
%token <ival> BPM
%type <plval> expression %type <plval> expression
%type <plval> predicate %type <plval> predicate
@ -107,6 +108,7 @@ predicate: strtag strbool ID { $$=pl_newcharpredicate($1, $2, $3); }
; ;
inttag: YEAR inttag: YEAR
| BPM
; ;
intbool: EQUALS { $$ = $1; } intbool: EQUALS { $$ = $1; }

6
src/playlist.c
View File

@ -116,6 +116,9 @@ void pl_dump_node(PL_NODE *pnode, int indent) {
case YEAR: case YEAR:
printf("YEAR "); printf("YEAR ");
break; break;
case BPM:
printf("BPM ");
break;
default: default:
printf ("<unknown tag> "); printf ("<unknown tag> ");
break; break;
@ -287,6 +290,9 @@ int pl_eval_node(MP3FILE *pmp3, PL_NODE *pnode) {
case YEAR: case YEAR:
ival=pmp3->year; ival=pmp3->year;
break; break;
case BPM:
ival=pmp3->bpm;
break;
} }
boolarg=(pnode->op) & 0x7FFFFFFF; boolarg=(pnode->op) & 0x7FFFFFFF;