diff options
| author | Michael Wittig <michael.wittig@fu-berlin.de> | 2010-10-14 14:40:13 +0200 |
|---|---|---|
| committer | Michael Wittig <michael.wittig@fu-berlin.de> | 2010-10-14 14:40:13 +0200 |
| commit | 9ab54bfaed55119fc24275136c249936e81939f8 (patch) | |
| tree | fb595ea846f22649204527d12120d786bdae28b0 | |
| parent | 083502684be81b8bff4460ccadf3a903290949a0 (diff) | |
| parent | ffc23bfadbd6094e4f441ef8b2b783cb28d1451b (diff) | |
| download | erlang-9ab54bfaed55119fc24275136c249936e81939f8.tar.gz erlang-9ab54bfaed55119fc24275136c249936e81939f8.tar.xz erlang-9ab54bfaed55119fc24275136c249936e81939f8.zip | |
Merge branch 'master' of ssh://git.animux.de/erlang
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | server/media.erl | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,2 +1,3 @@ *.beam folien.pdf +server/Mnesia.* diff --git a/server/media.erl b/server/media.erl index f5f4770..755d965 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). @@ -139,7 +139,7 @@ unlock(Artist, Title) -> end, mnesia:transaction(F). -lock_prozess(Artist, Title) -> +lock_process(Artist, Title) -> lock(Artist, Title), receive |