mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'

Browse Source 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
This commit is contained in:
Stefan Seyfried
2012-10-14 12:51:07 +02:00
parent e0c80399d6 dc95ffa37c
commit adb23b23ee
442 changed files with 7648 additions and 4167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/bookmarkmanager.cpp
View File

@@ -43,7 +43,6 @@
#include <gui/widget/buttons.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -90,7 +89,8 @@ int CBookmarkManager::createBookmark (const std::string & url, const std::string
}
//------------------------------------------------------------------------
#if 0
//never used
void CBookmarkManager::removeBookmark (unsigned int index) {
std::vector<CBookmark>::iterator p = bookmarks.begin()+index;
bookmarks.erase(p);
@@ -115,7 +115,7 @@ void CBookmarkManager::renameBookmark (unsigned int index) {
bookmarksmodified=true;
}
}
#endif
#define BOOKMARKSTRINGLENGTH (10 + 1)
#define BOOKMARKSTRINGMODIFICATIONPOINT 8
const char * const BOOKMARKSTRING = "bookmark0.";
@@ -195,7 +195,8 @@ CBookmarkManager::~CBookmarkManager () {
}
//------------------------------------------------------------------------
#if 0
//never used
int CBookmarkManager::getBookmarkCount(void) const {
return bookmarks.size();
}
@@ -205,7 +206,7 @@ int CBookmarkManager::getBookmarkCount(void) const {
int CBookmarkManager::getMaxBookmarkCount(void) const {
return MAXBOOKMARKS;
}
#endif
//------------------------------------------------------------------------
void CBookmarkManager::flush() {
@@ -215,7 +216,8 @@ void CBookmarkManager::flush() {
}
//------------------------------------------------------------------------
#if 0
//never used
const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
{
if (parent)
@@ -244,7 +246,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
listmaxshow=bookmarks.size();
height = theight+0+listmaxshow*fheight*2; // recalc height
}
if (!(bookmarks.empty() && selected==bookmarks.size()))
if ((!bookmarks.empty() && selected==bookmarks.size()))
{
selected=bookmarks.size()-1;
liststart = (selected/listmaxshow)*listmaxshow;
@@ -361,7 +363,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
else
return NULL;
}
#endif
//------------------------------------------------------------------------
void CBookmarkManager::paintItem(int pos)
{