mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 01:41:23 +02:00
*neutrino clean up: Streaming settings removed
- from all locales, locales.h, locales_intern.h - usage of settings in filebrowser.cpp, movieplayer.cpp, neutrino.cpp, neutrino.h, neutrino_menue.cpp, setting_helpers.cpp, setting_helpers.h, settings.h There is no reason to keep dead features, but if we need streaming settings sometime in future again, then we can dig out it. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1076 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -569,7 +569,6 @@ typedef enum {
|
||||
LOCALE_MAINSETTINGS_RECORDING,
|
||||
LOCALE_MAINSETTINGS_SAVESETTINGSNOW,
|
||||
LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT,
|
||||
LOCALE_MAINSETTINGS_STREAMING,
|
||||
LOCALE_MAINSETTINGS_VIDEO,
|
||||
LOCALE_MENU_BACK,
|
||||
LOCALE_MENU_CANCEL,
|
||||
|
@@ -569,7 +569,6 @@ const char *locale_real_names[] = {
|
||||
"mainsettings.recording",
|
||||
"mainsettings.savesettingsnow",
|
||||
"mainsettings.savesettingsnow_hint",
|
||||
"mainsettings.streaming",
|
||||
"mainsettings.video",
|
||||
"menu.back",
|
||||
"menu.cancel",
|
||||
|
@@ -241,36 +241,6 @@ bool CDHCPNotifier::changeNotify(const neutrino_locale_t, void * data)
|
||||
return true;
|
||||
}
|
||||
|
||||
CStreamingNotifier::CStreamingNotifier( CMenuItem* i1, CMenuItem* i2, CMenuItem* i3, CMenuItem* i4, CMenuItem* i5, CMenuItem* i6, CMenuItem* i7, CMenuItem* i8, CMenuItem* i9, CMenuItem* i10, CMenuItem* i11)
|
||||
{
|
||||
toDisable[0]=i1;
|
||||
toDisable[1]=i2;
|
||||
toDisable[2]=i3;
|
||||
toDisable[3]=i4;
|
||||
toDisable[4]=i5;
|
||||
toDisable[5]=i6;
|
||||
toDisable[6]=i7;
|
||||
toDisable[7]=i8;
|
||||
toDisable[8]=i9;
|
||||
toDisable[9]=i10;
|
||||
toDisable[10]=i11;
|
||||
}
|
||||
|
||||
bool CStreamingNotifier::changeNotify(const neutrino_locale_t, void *)
|
||||
{
|
||||
if(g_settings.streaming_type==0)
|
||||
{
|
||||
for (int i=0; i<=10; i++)
|
||||
toDisable[i]->setActive(false);
|
||||
}
|
||||
else if(g_settings.streaming_type==1)
|
||||
{
|
||||
for (int i=0; i<=10; i++)
|
||||
toDisable[i]->setActive(true);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
COnOffNotifier::COnOffNotifier( CMenuItem* a1,CMenuItem* a2,CMenuItem* a3,CMenuItem* a4,CMenuItem* a5)
|
||||
{
|
||||
number = 0;
|
||||
|
@@ -88,14 +88,6 @@ class CDHCPNotifier : public CChangeObserver
|
||||
bool changeNotify(const neutrino_locale_t, void * data);
|
||||
};
|
||||
|
||||
class CStreamingNotifier : public CChangeObserver
|
||||
{
|
||||
private:
|
||||
CMenuItem* toDisable[11];
|
||||
public:
|
||||
CStreamingNotifier( CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*);
|
||||
bool changeNotify(const neutrino_locale_t, void *);
|
||||
};
|
||||
class COnOffNotifier : public CChangeObserver
|
||||
{
|
||||
private:
|
||||
|
@@ -237,20 +237,6 @@ struct SNeutrinoSettings
|
||||
int recording_in_spts_mode;
|
||||
int recording_zap_on_announce;
|
||||
|
||||
//streaming
|
||||
int streaming_type;
|
||||
std::string streaming_server_ip;
|
||||
char streaming_server_port[10];
|
||||
char streaming_server_cddrive[21];
|
||||
char streaming_videorate[6];
|
||||
char streaming_audiorate[6];
|
||||
char streaming_server_startdir[40];
|
||||
int streaming_transcode_audio;
|
||||
int streaming_force_avi_rawaudio;
|
||||
int streaming_force_transcode_video;
|
||||
int streaming_transcode_video_codec;
|
||||
int streaming_resolution;
|
||||
|
||||
int filesystem_is_utf8;
|
||||
// default plugin for ts-movieplayer (red button)
|
||||
std::string movieplayer_plugin;
|
||||
|
Reference in New Issue
Block a user