1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-08 13:35:22.657983969 +0000
+++ src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-13 21:42:51.461959071 +0000
@@ -233,7 +233,7 @@
if (kCommSkipOn == autocommercialskip)
{
//: %1 is the skip time
- comm_msg = tr("Skip %1").arg(skipTime);
+ comm_msg = tr("Skip Commercial: %1").arg(skipTime);
}
else
{
@@ -269,10 +269,9 @@
if ((skipcommercials == (0 - lastCommSkipDirection)) &&
((time(NULL) - lastCommSkipTime) <= 5))
{
- comm_msg = tr("Skipping Back.");
-
- if (lastCommSkipStart > (2.0 * video_frame_rate))
- lastCommSkipStart -= (long long) (2.0 * video_frame_rate);
+ comm_msg = tr("Skipping Back");
+ if (lastCommSkipStart > (video_frame_rate))
+ lastCommSkipStart -= (long) (video_frame_rate);
lastCommSkipDirection = 0;
lastCommSkipTime = time(NULL);
jumpToFrame = lastCommSkipStart;
@@ -287,7 +286,7 @@
if ((commBreakIter == commBreakMap.begin()) &&
(skipcommercials < 0))
{
- comm_msg = tr("Start of program.");
+ comm_msg = tr("Start of Program");
jumpToFrame = 0;
return true;
}
@@ -297,7 +296,7 @@
((totalFrames) &&
((commBreakIter.key() + (10 * video_frame_rate)) > totalFrames))))
{
- comm_msg = tr("At End, cannot Skip.");
+ comm_msg = tr("At End, Cannot Skip");
return false;
}
@@ -313,7 +312,7 @@
{
if (commBreakIter == commBreakMap.begin())
{
- comm_msg = tr("Start of program.");
+ comm_msg = tr("Start of Program");
jumpToFrame = 0;
return true;
}
@@ -341,7 +340,7 @@
((commBreakIter.key() + (10 * video_frame_rate)) >
totalFrames)))
{
- comm_msg = tr("At End, cannot Skip.");
+ comm_msg = tr("At End, Cannot Skip");
return false;
}
}
|
