SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

correct PIBinaryLog play_speed 0

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@122 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Бычков Андрей
2015-04-27 10:46:18 +00:00
parent 57e0e56c71
commit d7fdfdf1ee
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/io/pibinarylog.cpp
View File

@@ -148,12 +148,14 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
if (delay > 0) { if (delay > 0) {
cdelay = delay * play_speed; cdelay = delay * play_speed;
dtc = int(cdelay) /100; dtc = int(cdelay) /100;
if (play_speed <= 0.) dtc = 1; if (play_speed <= 0.) dtc = 2;
//piCout << play_speed << dtc;
for (int j=0; j<dtc; j++) { for (int j=0; j<dtc; j++) {
if (play_speed <= 0.) j--;
cdelay = delay * play_speed; cdelay = delay * play_speed;
dtc = int(cdelay) /100; dtc = int(cdelay) /100;
PISystemTime::fromMilliseconds(100).sleep(); piMSleep(100);
if (play_speed <= 0.) {dtc = 2; j = 0;}
//piCout << " " << play_speed << dtc << j;
} }
cdelay = cdelay - dtc*100; cdelay = cdelay - dtc*100;
PISystemTime::fromMilliseconds(cdelay).sleep(); PISystemTime::fromMilliseconds(cdelay).sleep();
@@ -544,7 +546,7 @@ void PIBinaryLog::propertyChanged(const PIString &) {
rapid_start = property("rapidStart").toBool(); rapid_start = property("rapidStart").toBool();
play_mode = (PlayMode)property("playMode").toInt(); play_mode = (PlayMode)property("playMode").toInt();
double ps = property("playSpeed").toDouble(); double ps = property("playSpeed").toDouble();
play_speed = ps > 0 ? 1. / ps : 0; play_speed = ps > 0. ? 1. / ps : 0.;
play_delay = property("playDelay").toSystemTime(); play_delay = property("playDelay").toSystemTime();
split_mode = (SplitMode)property("splitMode").toInt(); split_mode = (SplitMode)property("splitMode").toInt();
split_time = property("splitTime").toSystemTime(); split_time = property("splitTime").toSystemTime();

2
src/io/pibinarylog.h
View File

@@ -103,7 +103,7 @@ public:
int defaultID() const {return default_id;} int defaultID() const {return default_id;}
//! Returns current play speed //! Returns current play speed
double playSpeed() const {return play_speed > 0 ? 1. / play_speed : 0;} double playSpeed() const {return play_speed > 0 ? 1. / play_speed : 0.;}
//! Returns current play delay //! Returns current play delay
PISystemTime playDelay() const {return play_delay;} PISystemTime playDelay() const {return play_delay;}