diff -Naur mythtv-master-20120823-g6566c3c-old/mythtv/libs/libmythtv/diseqc.cpp mythtv-master-20120823-g6566c3c-new/mythtv/libs/libmythtv/diseqc.cpp
|
old
|
new
|
|
| 667 | 667 | return false; |
| 668 | 668 | } |
| 669 | 669 | |
| | 670 | bool resend_cmd = false; |
| | 671 | |
| 670 | 672 | #ifndef USING_DVB |
| 671 | 673 | |
| 672 | 674 | (void) adr; |
| … |
… |
|
| 693 | 695 | |
| 694 | 696 | LOG(VB_CHANNEL, LOG_INFO, LOC + "Sending DiSEqC Command: " + cmdstr); |
| 695 | 697 | |
| | 698 | if (repeats >= 10) |
| | 699 | { |
| | 700 | repeats = repeats - 10; |
| | 701 | resend_cmd = true; |
| | 702 | } |
| | 703 | |
| 696 | 704 | // send the command |
| 697 | 705 | for (uint i = 0; i <= repeats; i++) |
| 698 | 706 | { |
| … |
… |
|
| 702 | 710 | return false; |
| 703 | 711 | } |
| 704 | 712 | |
| 705 | | mcmd.msg[0] |= DISEQC_FRM_REPEAT; |
| | 713 | if (!resend_cmd) |
| | 714 | mcmd.msg[0] |= DISEQC_FRM_REPEAT; |
| | 715 | |
| 706 | 716 | usleep(DISEQC_SHORT_WAIT); |
| 707 | 717 | } |
| 708 | 718 | |
diff -Naur mythtv-master-20120823-g6566c3c-old/mythtv/libs/libmythtv/diseqcsettings.cpp mythtv-master-20120823-g6566c3c-new/mythtv/libs/libmythtv/diseqcsettings.cpp
|
old
|
new
|
|
| 111 | 111 | { |
| 112 | 112 | public: |
| 113 | 113 | DeviceRepeatSetting(DiSEqCDevDevice &device) : |
| 114 | | SpinBoxSetting(this, 0, 5, 1), m_device(device) |
| | 114 | SpinBoxSetting(this, 0, 15, 1), m_device(device) |
| 115 | 115 | { |
| 116 | 116 | setLabel(DeviceTree::tr("Repeat Count")); |
| 117 | 117 | QString help = DeviceTree::tr( |
| 118 | | "Number of times to repeat DiSEqC commands sent to this device. " |
| 119 | | "Larger values may help with less reliable devices."); |
| | 118 | "Number of repeat (command with repeat flag ON) or resend (the same command) DiSEqC commands." |
| | 119 | "If value is higher than 10, command will be resend N-10 times" |
| | 120 | "If value is lower than 10, command will be repeated N times" |
| | 121 | "Repeat useful for unreliable DiSEqC equipment; resend useful when unreliable DiSEq equipment has broken/unsuported repeat flag support."); |
| 120 | 122 | setHelpText(help); |
| 121 | 123 | } |
| 122 | 124 | |