summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-03-21 21:54:18 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-03-21 21:54:18 +0000
commitcfed69ca942b61ae616b378d6209ca6b93ef7dd4 (patch)
treeaadbd321094867e36f82c6b095482e8a4d8153ba /src
parentc45882ae342607f721d53f258b700cb9b6958991 (diff)
downloadxine-lib-cfed69ca942b61ae616b378d6209ca6b93ef7dd4.tar.gz
xine-lib-cfed69ca942b61ae616b378d6209ca6b93ef7dd4.tar.bz2
bugfix
CVS patchset: 4465 CVS date: 2003/03/21 21:54:18
Diffstat (limited to 'src')
-rw-r--r--src/input/input_pvr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index d03a32558..933945e0d 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -39,7 +39,7 @@
* usage:
* xine pvr:<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
*
- * $Id: input_pvr.c,v 1.12 2003/03/21 17:54:53 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.13 2003/03/21 21:54:18 miguelfreitas Exp $
*/
/**************************************************************************
@@ -814,7 +814,6 @@ static void pvr_finish_recording (pvr_input_plugin_t *this) {
printf("input_pvr: finish_recording\n");
#endif
- pthread_mutex_lock(&this->lock);
if( this->rec_fd != -1 ) {
close(this->rec_fd);
@@ -891,8 +890,6 @@ static void pvr_finish_recording (pvr_input_plugin_t *this) {
if( this->save_name )
free( this->save_name );
this->save_name = NULL;
-
- pthread_mutex_unlock(&this->lock);
}
/*
@@ -913,10 +910,12 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
case XINE_EVENT_SET_V4L2:
if( v4l2_data->session_id != this->session ) {
/* if session changes -> closes the old one */
+ pthread_mutex_lock(&this->lock);
pvr_finish_recording(this);
time(&this->start_time);
this->show_time = this->start_time;
this->session = v4l2_data->session_id;
+ pthread_mutex_unlock(&this->lock);
} else {
/* no session change, break the page and store a new show_time */
pthread_mutex_lock(&this->dev_lock);