<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
</device>
<device name="dreambox remote control (native)">
+<!-- ikseong insert KEY_RECORD action -->
+ <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
<key id="KEY_RED" mapto="instantRecord" flags="b" />
</device>
</map>
<key id="KEY_ENTER" mapto="ok" flags="m" />
<key id="KEY_EXIT" mapto="back" flags="m" />
<key id="KEY_ESC" mapto="back" flags="m" />
+<!-- ikseong for factory test -->
+ <key id="KEY_SUBTITLE" mapto="test" flags="m" />
+ <key id="KEY_RADIO" mapto="testexit" flags="m" />
+ <key id="KEY_PAUSE" mapto="agingend" flags="m" />
+ <key id="KEY_STOP" mapto="agingfinish" flags="m" />
+ <key id="KEY_GREEN" mapto="agingstart" flags="m" />
</map>
<map context="InfobarMenuActions">
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
+ <key id="KEY_SPACE" mapto="mainMenu" flags="mr" />
</map>
<map context="MenuActions">
<key id="KEY_MENU" mapto="menu" flags="mr" />
+ <key id="KEY_SPACE" mapto="menu" flags="mr" />
</map>
<map context="InfobarShowHideActions">
<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
<key id="KEY_RADIO" mapto="showRadio" flags="m" />
<key id="KEY_TV" mapto="showTv" flags="m" />
+<!-- ikseong insert KEY_SUBTITLE action for subtitle hotkey -->
+ <key id="KEY_SUBTITLE" mapto="showSubtitle" flags="m" />
</map>
<map context="InfobarAudioSelectionActions">
<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
<key id="KEY_RED" mapto="seekBackManual" flags="l" />
<key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
+<!-- ikseong insert KEY_PAUSE, KEY_PLAY, KEY_REWIND, KEY_FASTFORWARD -->
+ <key id="KEY_PAUSE" mapto="pauseService" flags="m" />
+ <key id="KEY_PLAY" mapto="playpauseService" flags="m" />
+ <key id="KEY_REWIND" mapto="seekBack" flags="b" />
+ <key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+ <key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+ <key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PLAY" mapto="playpauseService" flags="m" />
<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
<key id="KEY_RED" mapto="seekBackManual" flags="l" />
<key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
+<!-- ikseong insert KEY_REWIND, KEY_FASTFORWARD -->
+ <key id="KEY_REWIND" mapto="seekBack" flags="b" />
+ <key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+ <key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+ <key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PREVIOUSSONG" mapto="seekBack" flags="b" />
<device name="dreambox remote control (native)">
<key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
+<!-- ikseong insert KEY_PAUSE, KEY_PLAY, KEY_STOP -->
+ <key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
+ <key id="KEY_PAUSE" mapto="timeshiftStart" flags="m" />
+ <key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
<device name="dreambox remote control (native)">
<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" />
+<!-- ikseong insert KEY_PAUSE, KEY_PLAY, KEY_REWIND -->
+ <key id="KEY_PLAY" mapto="timeshiftActivateEndAndPause" flags="m" />
+ <key id="KEY_REWIND" mapto="timeshiftActivateEnd" flags="m" />
+ <key id="KEY_PAUSE" mapto="timeshiftActivateEndAndPause" flags="m" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />
<map context="MovieSelectionActions">
<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+ <key id="KEY_SPACE" mapto="contextMenu" flags="m" />
<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
</map>
<map context="MoviePlayerActions">
<device name="dreambox remote control (native)">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
+ <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
+<!-- ikseong insert KEY_SUBTITLE action for subtitle hotkey -->
+ <key id="KEY_SUBTITLE" mapto="showSubtitle" flags="m" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
<map context="ChannelSelectEditActions">
<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+ <key id="KEY_SPACE" mapto="contextMenu" flags="m" />
</map>
<map context="TvRadioActions">
<key id="KEY_RADIO" mapto="shift_record" flags="l" />
<key id="KEY_PREVIOUS" mapto="previous" flags="m" />
<key id="KEY_NEXT" mapto="next" flags="m" />
+<!-- ikseong insert KEY_PAUSE, KEY_PLAY, KEY_STOP, KEY_RECORD, KEY_REWIND, KEY_FASTFORWARD -->
+ <key id="KEY_PAUSE" mapto="pause" flags="m" />
+ <key id="KEY_PLAY" mapto="play" flags="m" />
+ <key id="KEY_STOP" mapto="stop" flags="b" />
+ <key id="KEY_STOP" mapto="shift_stop" flags="l" />
+ <key id="KEY_RECORD" mapto="shift_record" flags="l" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
</device>
<key id="KEY_MENU" mapto="menu" flags="m" />
+ <key id="KEY_SPACE" mapto="menu" flags="m" />
<key id="KEY_2" mapto="skipListbegin" flags="m" />
<key id="KEY_8" mapto="skipListend" flags="m" />
m_boxtype = DM8000;
}
- eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d",
+ eDebug("found %zd adapter, %zd frontends(%zd sim) and %zd demux, boxtype %d",
m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype);
eDVBCAService::registerChannelCallback(this);
}
if (assigned != m_frontend.size()) {
char blasel[256];
- sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+ sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %zd socket informations, but %d registered frontends!",
m_frontend.size(), assigned);
PyErr_SetString(PyExc_StandardError, blasel);
return NULL;
}
} else if (state == iDVBFrontend::stateFailed)
{
+#ifdef BUILD_VUPLUS /* ikseong */
+ if (m_current_frontend_parameters)
+ {
+ eDebug("OURSTATE: lost lock, trying to retune");
+ ourstate = state_tuning;
+ m_frontend->get().tune(*m_current_frontend_parameters);
+ }
+ else
+ {
+ eDebug("OURSTATE: failed");
+ ourstate = state_failed;
+ }
+#else
eDebug("OURSTATE: failed");
ourstate = state_failed;
+#endif
} else
eFatal("state unknown");
size = max;
else
size = aligned_end - current_offset;
- eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
+ eDebug("HIT, %lld < %lld < %lld, size: %zd", i->first, current_offset, i->second, size);
return;
}
if (current_offset < aligned_start)
len = aligned_end - aligned_start;
start = aligned_end - len;
- eDebug("skipping to %llx, %d", start, len);
+ eDebug("skipping to %llx, %zd", start, len);
}
- eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
+ eDebug("result: %llx, %zx (%llx %llx)", start, size, aligned_start, aligned_end);
return;
}
}
{
start = current_offset;
size = max;
- eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+ eDebug("NO CUESHEET. (%08llx, %zd)", start, size);
} else
{
start = current_offset;
"showMovies": (self.showMovies, _("Play recorded movies...")),
"showRadio": (self.showRadio, _("Show the radio player...")),
"showTv": (self.showTv, _("Show the tv player...")),
+ # ikseong action for subtitle hotkey
+ "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")),
}, prio=2)
self.allowPiP = True
if service is not None:
self.session.open(MoviePlayer, service)
+ # ikseong action for subtitle hotkey
+ def showSubtitle(self):
+ from Screens.Subtitles import Subtitles
+ self.session.open(Subtitles)
+
class MoviePlayer(InfoBarBase, InfoBarShowHide, \
InfoBarMenu, \
InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
{
+ # ikseong action for subtitle hotkey
+ "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")),
"leavePlayer": (self.leavePlayer, _("leave movie player..."))
})
self.session.nav.stopService()
elif answer == "restart":
self.doSeek(0)
+ self.setSeekState(self.SEEK_STATE_PLAY)
def doEofInternal(self, playing):
if not self.execing:
self.returning = False
elif self.returning:
self.close()
+
+ # ikseong action for subtitle hotkey
+ def showSubtitle(self):
+ from Screens.Subtitles import Subtitles
+ self.session.open(Subtitles)
if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG)
info.m_description = "MPEG";
else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
- info.m_description = "AC3";
+ info.m_description = "Dolby Digital";
else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC)
info.m_description = "AAC";
else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAACHE)
eDebug("getting program info failed.");
else
{
- eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size());
+ eDebugNoNewLine("have %zd video stream(s)", program.videoStreams.size());
if (!program.videoStreams.empty())
{
eDebugNoNewLine(" (");
}
eDebugNoNewLine(")");
}
- eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+ eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
if (!program.audioStreams.empty())
{
eDebugNoNewLine(" (");
m_cue_entries.insert(cueEntry(where, what));
}
fclose(f);
- eDebug("%d entries", m_cue_entries.size());
+ eDebug("%zd entries", m_cue_entries.size());
} else
eDebug("cutfile not found!");