diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index b07bc9bda..8f9e42cdf 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -33,7 +33,6 @@ libneutrino_driver_a_SOURCES = \ radiotools.cpp \ radiotext.cpp \ fader.cpp \ - screenshot.cpp \ ringbuffer.c \ volume.cpp diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 2dd9cb819..2ebcf4f44 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -61,7 +61,9 @@ #include "gui/filebrowser.h" #include +#ifdef SCREENSHOT #include +#endif #include @@ -281,7 +283,9 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings) bindSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_KEYBINDINGMENU_MISC)); //bindSettings->addItem(new CMenuForwarder(keydescription[KEY_PLUGIN], true, NULL, keychooser[KEY_PLUGIN])); bindSettings->addItem(new CMenuForwarder(key_settings[KEY_UNLOCK].keydescription, true, keychooser[KEY_UNLOCK]->getKeyName(), keychooser[KEY_UNLOCK])); +#ifdef SCREENSHOT bindSettings->addItem(new CMenuForwarder(key_settings[KEY_SCREENSHOT].keydescription, true, keychooser[KEY_SCREENSHOT]->getKeyName(), keychooser[KEY_SCREENSHOT])); +#endif //bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_MENU_LEFT_EXIT, &g_settings.menu_left_exit, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_AUDIO_RUN_PLAYER, &g_settings.audio_run_player, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 767b072f5..54250d977 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -40,7 +40,9 @@ #include #include #include +#ifdef SCREENSHOT #include +#endif #include #include @@ -586,6 +588,7 @@ void CMoviePlayerGui::PlayFile(void) } if(restore) FileTime.show(position); +#ifdef SCREENSHOT } else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { char ending[(sizeof(int)*2) + 6] = ".jpg"; @@ -614,6 +617,7 @@ void CMoviePlayerGui::PlayFile(void) if(g_settings.screenshot_cover && !g_settings.screenshot_video) sc->EnableVideo(true); sc->Start(); +#endif } else if ( msg == NeutrinoMessages::ANNOUNCE_RECORD || msg == NeutrinoMessages::RECORD_START) { diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ffcb8d08e..92a3f0fa1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -54,7 +54,9 @@ #include #include #include +#ifdef SCREENSHOT #include +#endif #include #include "gui/audioplayer.h" @@ -2090,6 +2092,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) StartSubtitles(res < 0); } } +#ifdef SCREENSHOT else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { for(int i = 0; i < g_settings.screenshot_count; i++) { CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format); @@ -2097,6 +2100,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) sc->Start(); } } +#endif else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) { // Quick Zap StopSubtitles(); @@ -2510,6 +2514,7 @@ _repeat: g_videoSettings->SwitchFormat(); return messages_return::handled; } +#ifdef SCREENSHOT else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { //video+osd scaled to osd size CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format); @@ -2517,6 +2522,7 @@ _repeat: sc->MakeFileName(CZapit::getInstance()->GetCurrentChannelID()); sc->Start(); } +#endif /* ================================== MESSAGES ================================================ */ else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {