mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: disable screenshot code (incompatible License)

Browse Source 
Origin commit data
------------------
Commit: ca54ce2fb9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-15 (Sun, 15 Jan 2012)
This commit is contained in:
Stefan Seyfried
2012-01-15 23:24:47 +01:00
parent 061ff99bf9
commit c64306a3a1
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/driver/Makefile.am
View File

@@ -33,7 +33,6 @@ libneutrino_driver_a_SOURCES = \
radiotools.cpp \
radiotext.cpp \
fader.cpp \
screenshot.cpp \
ringbuffer.c \
volume.cpp

4
src/gui/keybind_setup.cpp
View File

@@ -61,7 +61,9 @@
#include "gui/filebrowser.h"
#include <driver/screen_max.h>
#ifdef SCREENSHOT
#include <driver/screenshot.h>
#endif
#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 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));

4
src/gui/movieplayer.cpp
View File

@@ -40,7 +40,9 @@
#include <gui/widget/helpbox.h>
#include <gui/infoclock.h>
#include <gui/plugins.h>
#ifdef SCREENSHOT
#include <driver/screenshot.h>
#endif
#include <stdio.h>
#include <stdlib.h>
@@ -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) {

6
src/neutrino.cpp
View File

@@ -54,7 +54,9 @@
#include <driver/shutdown_count.h>
#include <driver/stream2file.h>
#include <driver/record.h>
#ifdef SCREENSHOT
#include <driver/screenshot.h>
#endif
#include <driver/volume.h>
#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) {