From 083502684be81b8bff4460ccadf3a903290949a0 Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Thu, 14 Oct 2010 14:40:07 +0200 Subject: search_best --- server/media.erl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/server/media.erl b/server/media.erl index d20c8e9..f5f4770 100644 --- a/server/media.erl +++ b/server/media.erl @@ -91,14 +91,7 @@ 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]), - - % lock the song - F = fun() -> - New = Head#track{locked = 1}, - mnesia:write(New) - end, - mnesia:transaction(F), - + spawn(media, lock_process,[Artist,Title]), io:format("playing: ~s, Artist: ~s~n", [Title, Artist]), receive {Port, {exit_status, 0}} -> start_playing(); -- cgit v1.2.3 From ef4e9912fcb98fedd6926dd93deb9bdbaaa244e3 Mon Sep 17 00:00:00 2001 From: Marco Ziener Date: Thu, 14 Oct 2010 14:42:48 +0200 Subject: Locking added~ --- server/media.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/media.erl b/server/media.erl index 7e84b28..cbd9328 100644 --- a/server/media.erl +++ b/server/media.erl @@ -1,5 +1,5 @@ -module(media). --export([init/0,insert/3, ask/2, all/0, play/3, vote/2, devote/2]). +-export([init/0,insert/3, ask/2, all/0, play/3, vote/2, devote/2, lock_process/2]). -define(TESTPATTERN, "../ac/*.mp3"). -define(TIMEOUT, 10000). @@ -137,7 +137,7 @@ unlock(Artist, Title) -> end, mnesia:transaction(F). -lock_prozess(Artist, Title) -> +lock_process(Artist, Title) -> lock(Artist, Title), receive -- cgit v1.2.3