From 6c2aac98c6647ed3bec434788c18370e12fff117 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 14 Oct 2010 14:33:36 +0200 Subject: added media:init --- server/dispatcher.erl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'server') diff --git a/server/dispatcher.erl b/server/dispatcher.erl index 4f1f58b..9b4c61b 100644 --- a/server/dispatcher.erl +++ b/server/dispatcher.erl @@ -5,6 +5,8 @@ start() -> code:purge(server), code:load_abs("../common/server"), + spawn(media, init, []), + case server:start(dis, dispatcher) of true -> io:format("Server started... ~n"), -- cgit v1.2.3 From 1f3f1443259937eb08de6c001791b28514ba67d9 Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Thu, 14 Oct 2010 14:35:37 +0200 Subject: search_best --- server/media.erl | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'server') diff --git a/server/media.erl b/server/media.erl index fb1d951..8921724 100644 --- a/server/media.erl +++ b/server/media.erl @@ -19,7 +19,7 @@ init() -> mnesia:create_schema([node()]), mnesia:start(), - mnesia:create_table(track, [{index, [y]}, {attributes, record_info(fields, track)}]), + mnesia:create_table(track, [{attributes, record_info(fields, track)}]), read_files(filelib:wildcard(?TESTPATTERN),0,0), io:format("Initialisation of mnesia successful.\n"), start_playing(). @@ -52,13 +52,14 @@ insert(Artist, Title, Filepath) -> % search the track with the highest votes and return {Artist, Title} -search_best(_,_,_) -> {"Allison Crowe", "Northern Lights"}. -%search_best([Head|Rest], Max_Votes, Track) -> -% if (Max_Votes < Head#track.votes) and (Head#track.locked == 0) -> -% search_best(Rest, Head#track.votes, Head); -% true -> search_best(Rest, Max_Votes, Track) -% end; -%search_best([], _, Track) -> {Track#track.Artist, Track#track.Title}. +%search_best(_,_,_) -> {"Allison Crowe", "Northern Lights"}. +search_best([Head|Rest], Max_Votes, Track) -> + if + ((Max_Votes =< Head#track.votes) and (Head#track.locked == false)) -> + search_best(Rest, Head#track.votes, Head); + true -> search_best(Rest, Max_Votes, Track) + end; +search_best([], _, Track) -> {Track#track.artist, Track#track.title}. % We want to query in order to simplify the next calls. @@ -86,7 +87,15 @@ play(Artist, Title, Callback) -> [Head|_] = ask(Artist, Title), {_, Title, Artist, _, _, Fp} = Head, Port = erlang:open_port({spawn_executable, "/usr/bin/mplayer"}, [{args, [Fp]}, exit_status]), - io:format("playing: ~w, Artist: ~w~n", [Title, Artist]), + + % lock the song + F = fun() -> + New = Head#track{locked = 1}, + mnesia:write(New) + end, + mnesia:transaction(F), + + io:format("playing: ~s, Artist: ~s~n", [Title, Artist]), receive {Port, {exit_status, 0}} -> start_playing(); {Port, {exit_status, S}} -> throw({commandfailed, S}) -- cgit v1.2.3