X-Git-Url: http://git.tdb.fi/?p=xinema.git;a=blobdiff_plain;f=source%2Fxinestream.cpp;h=43a7d980d8862310c50bc9cd89133a18621ef2aa;hp=02fd3165de392af3a305fcf4787485214bf256ff;hb=2e629085885b652a10d775695e63bc4892aa2eca;hpb=649ced5849086abe7711d588f95a48677936515a

diff --git a/source/xinestream.cpp b/source/xinestream.cpp
index 02fd316..43a7d98 100644
--- a/source/xinestream.cpp
+++ b/source/xinestream.cpp
@@ -68,6 +68,7 @@ void XineStream::set_state(State s)
 	if(s==state)
 		return;
 
+	MutexLock lock(mutex);
 	state = s;
 	signal_state_changed.emit(state);
 }
@@ -86,17 +87,10 @@ void XineStream::tick()
 void XineStream::check_info()
 {
 	const char *xt = xine_get_meta_info(stream, XINE_META_INFO_TITLE);
-	if(xt)
+	if((xt && title.compare(xt)) || (!xt && !title.empty()))
 	{
-		if(title.compare(xt))
-		{
-			title = xt;
-			signal_title_changed.emit(title);
-		}
-	}
-	else if(!title.empty())
-	{
-		title.clear();
+		MutexLock lock(mutex);
+		title = (xt ? xt : string());
 		signal_title_changed.emit(title);
 	}
 
@@ -106,11 +100,13 @@ void XineStream::check_info()
 	Time::TimeDelta pos = pos_msec*Time::msec;
 	if(dur!=duration)
 	{
+		MutexLock lock(mutex);
 		duration = dur;
 		signal_duration_changed.emit(duration);
 	}
 	if(pos!=position)
 	{
+		MutexLock lock(mutex);
 		position = pos;
 		signal_position_changed.emit(position);
 	}