From: Miguel F. <mig...@us...> - 2003-06-29 21:56:19
|
Update of /cvsroot/xine/xine-lib/src/input In directory sc8-pr-cvs1:/tmp/cvs-serv8480 Modified Files: input_pvr.c Log Message: use the correct mutex Index: input_pvr.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_pvr.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- input_pvr.c 25 Jun 2003 00:28:41 -0000 1.25 +++ input_pvr.c 29 Jun 2003 21:56:17 -0000 1.26 @@ -658,7 +658,7 @@ } if( this->rec_fd != -1 ) { if( write(this->rec_fd, this->data, PVR_BLOCK_SIZE) < PVR_BLOCK_SIZE ) { - printf("input_pvr: short write to pvr file\n"); + printf("input_pvr: short write to pvr file (out of disk space?)\n"); return 0; } this->rec_blk++; @@ -995,14 +995,15 @@ this->session = v4l2_data->session_id; this->new_session = 1; this->pvr_play_paused = 0; + pvr_break_rec_page(this); pthread_mutex_unlock(&this->lock); xine_demux_flush_engine (this->stream); } else { /* no session change, break the page and store a new show_time */ - pthread_mutex_lock(&this->dev_lock); + pthread_mutex_lock(&this->lock); pvr_break_rec_page(this); this->show_page = this->rec_page; - pthread_mutex_unlock(&this->dev_lock); + pthread_mutex_unlock(&this->lock); time(&this->show_time); } @@ -1057,27 +1058,27 @@ #ifdef LOG printf("input_pvr: saving from this point\n"); #endif - pthread_mutex_lock(&this->dev_lock); + pthread_mutex_lock(&this->lock); pvr_break_rec_page(this); this->save_page = this->rec_page; time(&this->start_time); - pthread_mutex_unlock(&this->dev_lock); + pthread_mutex_unlock(&this->lock); break; case 1: #ifdef LOG printf("input_pvr: saving from show start\n"); #endif - pthread_mutex_lock(&this->dev_lock); + pthread_mutex_lock(&this->lock); this->save_page = this->show_page; - pthread_mutex_unlock(&this->dev_lock); + pthread_mutex_unlock(&this->lock); break; case 2: #ifdef LOG printf("input_pvr: saving everything so far\n"); #endif - pthread_mutex_lock(&this->dev_lock); + pthread_mutex_lock(&this->lock); this->save_page = this->first_page; - pthread_mutex_unlock(&this->dev_lock); + pthread_mutex_unlock(&this->lock); break; } } |