mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed direct switching between fast/slow forward and back
This commit is contained in:
parent
5513529419
commit
1e72e33a97
66
dvbapi.c
66
dvbapi.c
@ -7,7 +7,7 @@
|
|||||||
* DVD support initially written by Andreas Schultz <aschultz@warp10.net>
|
* DVD support initially written by Andreas Schultz <aschultz@warp10.net>
|
||||||
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
|
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
|
||||||
*
|
*
|
||||||
* $Id: dvbapi.c 1.115 2001/09/14 13:23:21 kls Exp $
|
* $Id: dvbapi.c 1.116 2001/09/14 14:19:37 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//#define DVDDEBUG 1
|
//#define DVDDEBUG 1
|
||||||
@ -873,6 +873,16 @@ void cPlayBuffer::Forward(void)
|
|||||||
{
|
{
|
||||||
if (canDoTrickMode) {
|
if (canDoTrickMode) {
|
||||||
switch (playMode) {
|
switch (playMode) {
|
||||||
|
case pmFast:
|
||||||
|
if (Setup.MultiSpeedMode) {
|
||||||
|
TrickSpeed(playDir == pdForward ? 1 : -1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (playDir == pdForward) {
|
||||||
|
Play();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// run into pmPlay
|
||||||
case pmPlay:
|
case pmPlay:
|
||||||
Empty(true);
|
Empty(true);
|
||||||
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
||||||
@ -882,6 +892,16 @@ void cPlayBuffer::Forward(void)
|
|||||||
TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
|
TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
|
||||||
Empty(false);
|
Empty(false);
|
||||||
break;
|
break;
|
||||||
|
case pmSlow:
|
||||||
|
if (Setup.MultiSpeedMode) {
|
||||||
|
TrickSpeed(playDir == pdForward ? -1 : 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (playDir == pdForward) {
|
||||||
|
Pause();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// run into pmPause
|
||||||
case pmStill:
|
case pmStill:
|
||||||
case pmPause:
|
case pmPause:
|
||||||
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
||||||
@ -890,18 +910,6 @@ void cPlayBuffer::Forward(void)
|
|||||||
trickSpeed = NORMAL_SPEED;
|
trickSpeed = NORMAL_SPEED;
|
||||||
TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
|
TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
|
||||||
break;
|
break;
|
||||||
case pmFast:
|
|
||||||
if (Setup.MultiSpeedMode)
|
|
||||||
TrickSpeed(playDir == pdForward ? 1 : -1);
|
|
||||||
else if (playDir == pdForward)
|
|
||||||
Play();
|
|
||||||
break;
|
|
||||||
case pmSlow:
|
|
||||||
if (Setup.MultiSpeedMode)
|
|
||||||
TrickSpeed(playDir == pdForward ? -1 : 1);
|
|
||||||
else if (playDir == pdForward)
|
|
||||||
Pause();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -910,6 +918,16 @@ void cPlayBuffer::Backward(void)
|
|||||||
{
|
{
|
||||||
if (canDoTrickMode) {
|
if (canDoTrickMode) {
|
||||||
switch (playMode) {
|
switch (playMode) {
|
||||||
|
case pmFast:
|
||||||
|
if (Setup.MultiSpeedMode) {
|
||||||
|
TrickSpeed(playDir == pdBackward ? 1 : -1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (playDir == pdBackward) {
|
||||||
|
Play();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// run into pmPlay
|
||||||
case pmPlay:
|
case pmPlay:
|
||||||
Empty(true);
|
Empty(true);
|
||||||
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
|
||||||
@ -919,6 +937,16 @@ void cPlayBuffer::Backward(void)
|
|||||||
TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
|
TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
|
||||||
Empty(false);
|
Empty(false);
|
||||||
break;
|
break;
|
||||||
|
case pmSlow:
|
||||||
|
if (Setup.MultiSpeedMode) {
|
||||||
|
TrickSpeed(playDir == pdBackward ? -1 : 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (playDir == pdBackward) {
|
||||||
|
Pause();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// run into pmPause
|
||||||
case pmStill:
|
case pmStill:
|
||||||
case pmPause:
|
case pmPause:
|
||||||
Empty(true);
|
Empty(true);
|
||||||
@ -929,18 +957,6 @@ void cPlayBuffer::Backward(void)
|
|||||||
TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
|
TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
|
||||||
Empty(false);
|
Empty(false);
|
||||||
break;
|
break;
|
||||||
case pmFast:
|
|
||||||
if (Setup.MultiSpeedMode)
|
|
||||||
TrickSpeed(playDir == pdBackward ? 1 : -1);
|
|
||||||
else if (playDir == pdBackward)
|
|
||||||
Play();
|
|
||||||
break;
|
|
||||||
case pmSlow:
|
|
||||||
if (Setup.MultiSpeedMode)
|
|
||||||
TrickSpeed(playDir == pdBackward ? -1 : 1);
|
|
||||||
else if (playDir == pdBackward)
|
|
||||||
Pause();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user