mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-06 21:28:32 +02:00
neutrino: disable screenshot code (incompatible License)
This commit is contained in:
@@ -33,7 +33,6 @@ libneutrino_driver_a_SOURCES = \
|
|||||||
radiotools.cpp \
|
radiotools.cpp \
|
||||||
radiotext.cpp \
|
radiotext.cpp \
|
||||||
fader.cpp \
|
fader.cpp \
|
||||||
screenshot.cpp \
|
|
||||||
ringbuffer.c \
|
ringbuffer.c \
|
||||||
volume.cpp
|
volume.cpp
|
||||||
|
|
||||||
|
@@ -61,7 +61,9 @@
|
|||||||
#include "gui/filebrowser.h"
|
#include "gui/filebrowser.h"
|
||||||
|
|
||||||
#include <driver/screen_max.h>
|
#include <driver/screen_max.h>
|
||||||
|
#ifdef SCREENSHOT
|
||||||
#include <driver/screenshot.h>
|
#include <driver/screenshot.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <system/debug.h>
|
#include <system/debug.h>
|
||||||
|
|
||||||
@@ -281,7 +283,9 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings)
|
|||||||
bindSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_KEYBINDINGMENU_MISC));
|
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(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]));
|
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]));
|
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_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_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));
|
bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_AUDIO_RUN_PLAYER, &g_settings.audio_run_player, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||||
|
@@ -40,7 +40,9 @@
|
|||||||
#include <gui/widget/helpbox.h>
|
#include <gui/widget/helpbox.h>
|
||||||
#include <gui/infoclock.h>
|
#include <gui/infoclock.h>
|
||||||
#include <gui/plugins.h>
|
#include <gui/plugins.h>
|
||||||
|
#ifdef SCREENSHOT
|
||||||
#include <driver/screenshot.h>
|
#include <driver/screenshot.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -586,6 +588,7 @@ void CMoviePlayerGui::PlayFile(void)
|
|||||||
}
|
}
|
||||||
if(restore)
|
if(restore)
|
||||||
FileTime.show(position);
|
FileTime.show(position);
|
||||||
|
#ifdef SCREENSHOT
|
||||||
} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
||||||
|
|
||||||
char ending[(sizeof(int)*2) + 6] = ".jpg";
|
char ending[(sizeof(int)*2) + 6] = ".jpg";
|
||||||
@@ -614,6 +617,7 @@ void CMoviePlayerGui::PlayFile(void)
|
|||||||
if(g_settings.screenshot_cover && !g_settings.screenshot_video)
|
if(g_settings.screenshot_cover && !g_settings.screenshot_video)
|
||||||
sc->EnableVideo(true);
|
sc->EnableVideo(true);
|
||||||
sc->Start();
|
sc->Start();
|
||||||
|
#endif
|
||||||
|
|
||||||
} else if ( msg == NeutrinoMessages::ANNOUNCE_RECORD ||
|
} else if ( msg == NeutrinoMessages::ANNOUNCE_RECORD ||
|
||||||
msg == NeutrinoMessages::RECORD_START) {
|
msg == NeutrinoMessages::RECORD_START) {
|
||||||
|
@@ -54,7 +54,9 @@
|
|||||||
#include <driver/shutdown_count.h>
|
#include <driver/shutdown_count.h>
|
||||||
#include <driver/stream2file.h>
|
#include <driver/stream2file.h>
|
||||||
#include <driver/record.h>
|
#include <driver/record.h>
|
||||||
|
#ifdef SCREENSHOT
|
||||||
#include <driver/screenshot.h>
|
#include <driver/screenshot.h>
|
||||||
|
#endif
|
||||||
#include <driver/volume.h>
|
#include <driver/volume.h>
|
||||||
|
|
||||||
#include "gui/audioplayer.h"
|
#include "gui/audioplayer.h"
|
||||||
@@ -2090,6 +2092,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
|
|||||||
StartSubtitles(res < 0);
|
StartSubtitles(res < 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef SCREENSHOT
|
||||||
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
||||||
for(int i = 0; i < g_settings.screenshot_count; i++) {
|
for(int i = 0; i < g_settings.screenshot_count; i++) {
|
||||||
CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format);
|
CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format);
|
||||||
@@ -2097,6 +2100,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
|
|||||||
sc->Start();
|
sc->Start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) {
|
else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) {
|
||||||
// Quick Zap
|
// Quick Zap
|
||||||
StopSubtitles();
|
StopSubtitles();
|
||||||
@@ -2510,6 +2514,7 @@ _repeat:
|
|||||||
g_videoSettings->SwitchFormat();
|
g_videoSettings->SwitchFormat();
|
||||||
return messages_return::handled;
|
return messages_return::handled;
|
||||||
}
|
}
|
||||||
|
#ifdef SCREENSHOT
|
||||||
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
|
||||||
//video+osd scaled to osd size
|
//video+osd scaled to osd size
|
||||||
CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format);
|
CScreenShot * sc = new CScreenShot("", (CScreenShot::screenshot_format_t)g_settings.screenshot_format);
|
||||||
@@ -2517,6 +2522,7 @@ _repeat:
|
|||||||
sc->MakeFileName(CZapit::getInstance()->GetCurrentChannelID());
|
sc->MakeFileName(CZapit::getInstance()->GetCurrentChannelID());
|
||||||
sc->Start();
|
sc->Start();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* ================================== MESSAGES ================================================ */
|
/* ================================== MESSAGES ================================================ */
|
||||||
else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
|
else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
|
||||||
|
Reference in New Issue
Block a user