From d3e9b13d93d2b64cefdbff408bebc4e0be01f0a9 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 14 Oct 2010 14:35:43 +0200
Subject: ignored mnesia database

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5f61fbd..7a5856f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.beam
 folien.pdf
+server/Mnesia.*
-- 
cgit v1.2.3


From ef4e9912fcb98fedd6926dd93deb9bdbaaa244e3 Mon Sep 17 00:00:00 2001
From: Marco Ziener <mziener@lavabit.com>
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