mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
- follow-up patch for rev. 1909
- fix warning in moviebrowser.cpp git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1918 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -448,7 +448,7 @@ class CMenuSelector : public CMenuItem
|
||||
class CMenuWidgetSelection : public CMenuWidget
|
||||
{
|
||||
public:
|
||||
CMenuWidgetSelection(const neutrino_locale_t Name, const std::string & Icon = "", const int mwidth = 400, const int mheight = 576) : CMenuWidget( Name,Icon,mwidth, mheight){;};
|
||||
CMenuWidgetSelection(const neutrino_locale_t Name, const std::string & Icon = "", const int mwidth = 30) : CMenuWidget(Name, Icon, mwidth){;};
|
||||
int getSelectedLine(void){return exit_pressed ? -1 : selected;};
|
||||
};
|
||||
|
||||
|
@@ -41,7 +41,7 @@
|
||||
#include <driver/fontrenderer.h>
|
||||
#include <driver/rcinput.h>
|
||||
|
||||
CMountChooser::CMountChooser(const neutrino_locale_t Name, const std::string & Icon, int * chosenIndex, char * chosenLocalDir, const char * const selectedLocalDir, const int mwidth, const int mheight)
|
||||
CMountChooser::CMountChooser(const neutrino_locale_t Name, const std::string & Icon, int * chosenIndex, char * chosenLocalDir, const char * const selectedLocalDir, const int mwidth)
|
||||
: CMenuWidget(Name, Icon,mwidth,mheight), index(chosenIndex), localDir(chosenLocalDir)
|
||||
{
|
||||
char indexStr[2];
|
||||
|
@@ -56,7 +56,7 @@ class CMountChooser : public CMenuWidget
|
||||
|
||||
public:
|
||||
|
||||
CMountChooser(const neutrino_locale_t Name, const std::string & Icon = "", int * chosenIndex = NULL, char * chosenLocalDir = NULL, const char * const selectedLocalDir = "", const int mwidth = 80, const int mheight = 576);
|
||||
CMountChooser(const neutrino_locale_t Name, const std::string & Icon = "", int * chosenIndex = NULL, char * chosenLocalDir = NULL, const char * const selectedLocalDir = "", const int mwidth = 80);
|
||||
int exec(CMenuTarget* parent, const std::string & actionKey);
|
||||
void setSelectedItem(int selection);
|
||||
|
||||
|
@@ -149,11 +149,11 @@ extern CBouquetManager *g_bouquetManager;
|
||||
void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mode)
|
||||
{
|
||||
std::vector<CMenuWidget *> toDelete;
|
||||
CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width, height);
|
||||
CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width);
|
||||
mctv.addIntroItems();
|
||||
|
||||
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) {
|
||||
CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width, height);
|
||||
CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width);
|
||||
toDelete.push_back(mwtv);
|
||||
mwtv->addIntroItems();
|
||||
ZapitChannelList channels = (mode == CZapitClient::MODE_RADIO) ? g_bouquetManager->Bouquets[i]->radioChannels : g_bouquetManager->Bouquets[i]->tvChannels;
|
||||
|
Reference in New Issue
Block a user