Ticket #1219: mythtv_startup2.patch
File mythtv_startup2.patch, 2.3 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.h
569 573 bool m_playing_slower; 570 574 bool decode_extra_audio; 571 575 float m_stored_audio_stretchfactor; 576 bool audio_paused; 572 577 573 578 // Audio warping stuff 574 579 bool usevideotimebase; -
libs/libmythtv/NuppelVideoPlayer.cpp
159 160 avsync_oldavg(0), refreshrate(0), 160 161 lastsync(false), m_playing_slower(false), 161 162 m_stored_audio_stretchfactor(1.0), 163 audio_paused(false), 162 164 // Audio warping stuff 163 165 usevideotimebase(false), 164 166 warpfactor(1.0f), warpfactor_avg(1.0f), … … 282 284 //cout << "stopping other threads" << endl; 283 285 PauseVideo(waitvideo); 284 286 if (audioOutput) 287 { 288 audio_paused = true; 285 289 audioOutput->Pause(true); 290 } 286 291 if (ringBuffer) 287 292 ringBuffer->Pause(); 288 293 … … 304 309 305 310 UnpauseVideo(); 306 311 if (audioOutput && unpauseaudio) 307 audio Output->Pause(false);312 audio_paused = false; 308 313 if (ringBuffer) 309 314 ringBuffer->Unpause(); 310 315 … … 352 358 { 353 359 prebuffering = prebuffer; 354 360 if (audioOutput && !paused) 355 audioOutput->Pause(prebuffering); 361 { 362 if (prebuffering) 363 audioOutput->Pause(prebuffering); 364 audio_paused = prebuffering; 365 } 356 366 } 357 367 358 368 if (!prebuffering) … … 1929 1960 videoOutput->ProcessFrame(frame, osd, videoFilters, pipplayer); 1930 1961 videofiltersLock.unlock(); 1931 1962 1963 if (audioOutput && !audio_paused && audioOutput->GetPause()) 1964 audioOutput->Pause(false); 1965 1932 1966 AVSync(); 1933 1967 1934 1968 videoOutput->DoneDisplayingFrame(); … … 2361 2397 } 2362 2398 2363 2399 if (audioOutput) 2400 { 2401 audio_paused = true; 2402 audioOutput->Pause(true); // always start audio off as paused 2364 2403 audioOutput->SetStretchFactor(audio_stretchfactor); 2404 } 2365 2405 next_play_speed = audio_stretchfactor; 2366 2406 2367 2407 if (!InitVideo())