Index: daemons/nhttpd/yapi.h =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/daemons/nhttpd/yapi.h,v retrieving revision 1.7 diff -u -r1.7 yapi.h --- daemons/nhttpd/yapi.h 18 Mar 2006 16:50:07 -0000 1.7 +++ daemons/nhttpd/yapi.h 27 May 2006 18:41:21 -0000 @@ -35,7 +35,6 @@ #include #include #include -#include //#include //#include Index: data/locale/deutsch.locale =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/data/locale/deutsch.locale,v retrieving revision 1.393 diff -u -r1.393 deutsch.locale --- data/locale/deutsch.locale 27 May 2006 10:24:34 -0000 1.393 +++ data/locale/deutsch.locale 27 May 2006 18:41:22 -0000 @@ -608,7 +608,6 @@ moviebrowser.menu_main_head Einstellungen moviebrowser.menu_main_movieinfo Film-Info moviebrowser.menu_main_saveandback Speichern und verlassen -moviebrowser.menu_nfs_head NFS Einstellung moviebrowser.menu_parental_lock_activated aktiviert moviebrowser.menu_parental_lock_activated_no nein moviebrowser.menu_parental_lock_activated_no_temp nein (temporär) @@ -691,7 +690,6 @@ networkmenu.gateway Standard Gateway networkmenu.head Netzwerk Einstellungen networkmenu.ipaddress IP-Adresse -networkmenu.mount NFS/CIFS/FTPFS networkmenu.nameserver Nameserver networkmenu.netmask Netzmaske networkmenu.ntpenable Syncronisation via @@ -706,28 +704,6 @@ networkmenu.setuponstartup Beim Starten Netzwerk setzen networkmenu.show aktive Netzwerkeinstellungen zeigen networkmenu.test Netzwerk testen -nfs.alreadymounted Verzeichnis bereits gemountet. -nfs.automount Beim Start mounten -nfs.dir Verzeichnis/Freigabe -nfs.ip Server IP -nfs.localdir lokales Verzeichnis -nfs.mount Netzwerk Verzeichnis mounten -nfs.mount_options Mount-Optionen -nfs.mounterror Mount-Fehler -nfs.mounterror_notsup Dateisystem-Typ wird nicht unterstützt. -nfs.mountnow Jetzt mounten -nfs.mountok Mount erfolgreich -nfs.mounttimeout Mount-Fehler: Timeout -nfs.password Passwort -nfs.remount Verzeichnisse erneut mounten -nfs.type Typ -nfs.type_cifs CIFS -nfs.type_lufs FTPFS -nfs.type_nfs NFS -nfs.umount Netzwerk Verzeichnis unmounten -nfs.umounterror Umount-Fehler -nfs.username Benutzername -nfsmenu.head NFS/CIFS/FTPFS Einstellungen nvod.percentage (%d%% vorbei) nvod.starting (Beginn in %d min) nvodselector.directormode Bildregie-Modus Index: src/neutrino.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/neutrino.cpp,v retrieving revision 1.822 diff -u -r1.822 neutrino.cpp --- src/neutrino.cpp 27 May 2006 10:24:35 -0000 1.822 +++ src/neutrino.cpp 27 May 2006 18:41:24 -0000 @@ -109,7 +109,6 @@ #include "gui/movieplayer.h" #endif -#include "gui/nfs.h" #include "gui/pictureviewer.h" #include "gui/motorcontrol.h" @@ -118,7 +117,6 @@ #include #include #include -#include #include @@ -1466,7 +1464,6 @@ moviePlayer.addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_VCDPLAYBACK, true, NULL, moviePlayerGui, "vcdplayback", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); moviePlayer.addItem(GenericMenuSeparatorLine); moviePlayer.addItem(new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &streamingSettings, NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL)); - moviePlayer.addItem(new CMenuForwarder(LOCALE_NFSMENU_HEAD, true, NULL, new CNFSSmallMenu(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); #endif mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_3)); @@ -2298,9 +2295,6 @@ networkSettings.addItem(new CMenuOptionChooser(LOCALE_NETWORKMENU_NTPENABLE, &g_settings.network_ntpenable, OPTIONS_NTPENABLE_OPTIONS, OPTIONS_NTPENABLE_OPTION_COUNT , true)); networkSettings.addItem( m6); networkSettings.addItem( m7); - networkSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_NETWORKMENU_MOUNT)); - networkSettings.addItem(new CMenuForwarder(LOCALE_NFS_MOUNT , true, NULL, new CNFSMountGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); - networkSettings.addItem(new CMenuForwarder(LOCALE_NFS_UMOUNT, true, NULL, new CNFSUmountGui(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); } #define RECORDINGMENU_RECORDING_TYPE_OPTION_COUNT 4 @@ -3127,31 +3121,6 @@ if (userDecision != -1) { recDir = g_settings.network_nfs_local_dir[userDecision]; - if (!CFSMounter::isMounted(g_settings.network_nfs_local_dir[userDecision])) - { - CFSMounter::MountRes mres = - CFSMounter::mount(g_settings.network_nfs_ip[userDecision].c_str(), - g_settings.network_nfs_dir[userDecision], - g_settings.network_nfs_local_dir[userDecision], - (CFSMounter::FSType) g_settings.network_nfs_type[userDecision], - g_settings.network_nfs_username[userDecision], - g_settings.network_nfs_password[userDecision], - g_settings.network_nfs_mount_options1[userDecision], - g_settings.network_nfs_mount_options2[userDecision]); - if (mres != CFSMounter::MRES_OK) - { - doRecord = false; - const char * merr = mntRes2Str(mres); - int msglen = strlen(merr) + strlen(g_settings.network_nfs_local_dir[userDecision]) + 7; - char msg[msglen]; - strcpy(msg,merr); - strcat(msg,"\nDir: "); - strcat(msg,g_settings.network_nfs_local_dir[userDecision]); - - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, msg, - CMessageBox::mbrBack, CMessageBox::mbBack,NEUTRINO_ICON_ERROR, 450, 10); // UTF-8 - } - } } else { doRecord = false; @@ -3339,9 +3308,6 @@ g_PluginList = new CPlugins; g_PluginList->setPluginDir(PLUGINDIR); - // mount shares before scanning for plugins - CFSMounter::automount(); - //load Pluginlist before main menu (only show script menu if at least one // script is available g_PluginList->loadPlugins(); @@ -4669,46 +4635,6 @@ { char *recDir = strlen(nextRecordingInfo->recordingDir) > 0 ? nextRecordingInfo->recordingDir : g_settings.network_nfs_recordingdir; - if (!CFSMounter::isMounted(recDir)) - { - printf("[neutrino.cpp] trying to mount %s\n",recDir); - doRecord = false; - for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) - { - if (strcmp(g_settings.network_nfs_local_dir[i],recDir) == 0) - { - CFSMounter::MountRes mres = - CFSMounter::mount(g_settings.network_nfs_ip[i].c_str(), g_settings.network_nfs_dir[i], - g_settings.network_nfs_local_dir[i], (CFSMounter::FSType) g_settings.network_nfs_type[i], - g_settings.network_nfs_username[i], g_settings.network_nfs_password[i], - g_settings.network_nfs_mount_options1[i], g_settings.network_nfs_mount_options2[i]); - if (mres == CFSMounter::MRES_OK) - { - printf("[neutrino.cpp] mount successful\n"); - doRecord = true; - } else { - const char * merr = mntRes2Str(mres); - int msglen = strlen(merr) + strlen(nextRecordingInfo->recordingDir) + 7; - char msg[msglen]; - strcpy(msg,merr); - strcat(msg,"\nDir: "); - strcat(msg,nextRecordingInfo->recordingDir); - - ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, msg); // UTF-8 - doRecord = false; - } - break; - } - } - if (!doRecord) - { - // recording dir does not seem to exist in config anymore - // or an error occured while mounting - // -> try default dir - recDir = g_settings.network_nfs_recordingdir; - doRecord = true; - } - } if (doRecord) { printf("[neutrino.cpp] recording to %s\n",recDir); Index: src/gui/Makefile.am =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/Makefile.am,v retrieving revision 1.37 diff -u -r1.37 Makefile.am --- src/gui/Makefile.am 21 Jan 2006 15:45:51 -0000 1.37 +++ src/gui/Makefile.am 27 May 2006 18:41:24 -0000 @@ -18,7 +18,7 @@ bouquetlist.cpp channellist.cpp eventlist.cpp pluginlist.cpp \ color.cpp favorites.cpp sleeptimer.cpp screensetup.cpp \ epgview.cpp infoviewer.cpp scan.cpp update.cpp \ - filebrowser.cpp audioplayer.cpp nfs.cpp pictureviewer.cpp \ + filebrowser.cpp audioplayer.cpp pictureviewer.cpp \ movieplayer.cpp rc_lock.cpp bookmarkmanager.cpp \ timeosd.cpp epgplus.cpp epg_menu.cpp \ streaminfo2.cpp plugins.cpp imageinfo.cpp \ Index: src/gui/audioplayer.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/audioplayer.cpp,v retrieving revision 1.43 diff -u -r1.43 audioplayer.cpp --- src/gui/audioplayer.cpp 30 Nov 2005 05:24:32 -0000 1.43 +++ src/gui/audioplayer.cpp 27 May 2006 18:41:25 -0000 @@ -51,7 +51,6 @@ #include #include #include -#include #include #include @@ -836,8 +835,6 @@ else if(msg == CRCInput::RC_setup) { - CNFSSmallMenu nfsMenu; - nfsMenu.exec(this, ""); CLCD::getInstance()->setMode(CLCD::MODE_AUDIO); paintLCD(); update = true; Index: src/gui/moviebrowser.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/moviebrowser.cpp,v retrieving revision 1.8 diff -u -r1.8 moviebrowser.cpp --- src/gui/moviebrowser.cpp 20 Feb 2006 01:10:34 -0000 1.8 +++ src/gui/moviebrowser.cpp 27 May 2006 18:41:27 -0000 @@ -83,7 +83,6 @@ #include "widget/messagebox.h" #include #include -#include #include "neutrino.h" #include #include // for statfs @@ -837,7 +836,6 @@ if(g_settings.network_nfs_automount[i]) umount2(g_settings.network_nfs_local_dir[i],MNT_FORCE); } - CFSMounter::automount(); } if(m_file_info_stale == true) @@ -2811,8 +2809,6 @@ else mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD, true, NULL, &parentalMenu)); CMovieHelp* movieHelp; - CNFSSmallMenu* nfs; - mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs = new CNFSSmallMenu(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_HELP_HEAD, true, NULL, movieHelp = new CMovieHelp(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); mainMenu.exec(NULL, "aabb"); @@ -2879,7 +2875,6 @@ delete pBookItemMenu[i]; } delete movieHelp; - delete nfs; delete cSelectedMenuSave; delete cSelectedMenuReload; Index: src/gui/movieplayer.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/movieplayer.cpp,v retrieving revision 1.128 diff -u -r1.128 movieplayer.cpp --- src/gui/movieplayer.cpp 21 May 2006 07:07:19 -0000 1.128 +++ src/gui/movieplayer.cpp 27 May 2006 18:41:29 -0000 @@ -49,7 +49,6 @@ #include #include #include -#include #include #include Index: src/gui/pictureviewer.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/pictureviewer.cpp,v retrieving revision 1.57 diff -u -r1.57 pictureviewer.cpp --- src/gui/pictureviewer.cpp 29 Oct 2004 21:32:01 -0000 1.57 +++ src/gui/pictureviewer.cpp 27 May 2006 18:41:29 -0000 @@ -44,8 +44,6 @@ #include #include -#include - #include #include #include @@ -473,8 +471,6 @@ { if(m_state==MENU) { - CNFSSmallMenu nfsMenu; - nfsMenu.exec(this, ""); update=true; CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD)); } Index: src/gui/timerlist.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/timerlist.cpp,v retrieving revision 1.90 diff -u -r1.90 timerlist.cpp --- src/gui/timerlist.cpp 1 Mar 2006 21:18:00 -0000 1.90 +++ src/gui/timerlist.cpp 27 May 2006 18:41:29 -0000 @@ -59,7 +59,6 @@ #include #include -#include #include #include Index: src/gui/update.cpp =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/update.cpp,v retrieving revision 1.122 diff -u -r1.122 update.cpp --- src/gui/update.cpp 6 May 2006 09:09:44 -0000 1.122 +++ src/gui/update.cpp 27 May 2006 18:41:30 -0000 @@ -44,7 +44,6 @@ #include #include -#include #include #include @@ -465,10 +464,6 @@ hide(); - // Unmount all NFS & CIFS volumes - nfs_mounted_once = false; /* needed by update.cpp to prevent removal of modules after flashing a new cramfs, since rmmod (busybox) might no longer be available */ - CFSMounter::umount(); - ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_FLASHREADYREBOOT)); // UTF-8 ft.reboot(); sleep(20000); Index: src/system/Makefile.am =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/system/Makefile.am,v retrieving revision 1.14 diff -u -r1.14 Makefile.am --- src/system/Makefile.am 19 Mar 2006 19:55:37 -0000 1.14 +++ src/system/Makefile.am 27 May 2006 18:41:30 -0000 @@ -13,4 +13,4 @@ localize.cpp setting_helpers.cpp debug.cpp \ ping.c flashtool.cpp httptool.cpp \ settings.cpp lastchannel.cpp \ - configure_network.cpp fsmounter.cpp helper.cpp + configure_network.cpp helper.cpp Index: src/system/locals.h =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/system/locals.h,v retrieving revision 1.71 diff -u -r1.71 locals.h --- src/system/locals.h 27 May 2006 10:24:36 -0000 1.71 +++ src/system/locals.h 27 May 2006 18:41:30 -0000 @@ -2,7 +2,7 @@ #define __locals__ /* - * $Id: locals.h,v 1.71 2006/05/27 10:24:36 barf Exp $ + * $Id$ * * (C) 2004 by thegoodguy * @@ -635,7 +635,6 @@ LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD, LOCALE_MOVIEBROWSER_MENU_MAIN_MOVIEINFO, LOCALE_MOVIEBROWSER_MENU_MAIN_SAVEANDBACK, - LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED_NO_TEMP, @@ -718,7 +717,6 @@ LOCALE_NETWORKMENU_GATEWAY, LOCALE_NETWORKMENU_HEAD, LOCALE_NETWORKMENU_IPADDRESS, - LOCALE_NETWORKMENU_MOUNT, LOCALE_NETWORKMENU_NAMESERVER, LOCALE_NETWORKMENU_NETMASK, LOCALE_NETWORKMENU_NTPENABLE, @@ -733,28 +731,6 @@ LOCALE_NETWORKMENU_SETUPONSTARTUP, LOCALE_NETWORKMENU_SHOW, LOCALE_NETWORKMENU_TEST, - LOCALE_NFS_ALREADYMOUNTED, - LOCALE_NFS_AUTOMOUNT, - LOCALE_NFS_DIR, - LOCALE_NFS_IP, - LOCALE_NFS_LOCALDIR, - LOCALE_NFS_MOUNT, - LOCALE_NFS_MOUNT_OPTIONS, - LOCALE_NFS_MOUNTERROR, - LOCALE_NFS_MOUNTERROR_NOTSUP, - LOCALE_NFS_MOUNTNOW, - LOCALE_NFS_MOUNTOK, - LOCALE_NFS_MOUNTTIMEOUT, - LOCALE_NFS_PASSWORD, - LOCALE_NFS_REMOUNT, - LOCALE_NFS_TYPE, - LOCALE_NFS_TYPE_CIFS, - LOCALE_NFS_TYPE_LUFS, - LOCALE_NFS_TYPE_NFS, - LOCALE_NFS_UMOUNT, - LOCALE_NFS_UMOUNTERROR, - LOCALE_NFS_USERNAME, - LOCALE_NFSMENU_HEAD, LOCALE_NVOD_PERCENTAGE, LOCALE_NVOD_STARTING, LOCALE_NVODSELECTOR_DIRECTORMODE, Index: src/system/locals_intern.h =================================================================== RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/system/locals_intern.h,v retrieving revision 1.72 diff -u -r1.72 locals_intern.h --- src/system/locals_intern.h 27 May 2006 10:24:36 -0000 1.72 +++ src/system/locals_intern.h 27 May 2006 18:41:30 -0000 @@ -2,7 +2,7 @@ #define __locals_intern__ /* - * $Id: locals_intern.h,v 1.72 2006/05/27 10:24:36 barf Exp $ + * $Id$ * * (C) 2004 by thegoodguy * @@ -635,7 +635,6 @@ "moviebrowser.menu_main_head", "moviebrowser.menu_main_movieinfo", "moviebrowser.menu_main_saveandback", - "moviebrowser.menu_nfs_head", "moviebrowser.menu_parental_lock_activated", "moviebrowser.menu_parental_lock_activated_no", "moviebrowser.menu_parental_lock_activated_no_temp", @@ -718,7 +717,6 @@ "networkmenu.gateway", "networkmenu.head", "networkmenu.ipaddress", - "networkmenu.mount", "networkmenu.nameserver", "networkmenu.netmask", "networkmenu.ntpenable", @@ -733,28 +731,6 @@ "networkmenu.setuponstartup", "networkmenu.show", "networkmenu.test", - "nfs.alreadymounted", - "nfs.automount", - "nfs.dir", - "nfs.ip", - "nfs.localdir", - "nfs.mount", - "nfs.mount_options", - "nfs.mounterror", - "nfs.mounterror_notsup", - "nfs.mountnow", - "nfs.mountok", - "nfs.mounttimeout", - "nfs.password", - "nfs.remount", - "nfs.type", - "nfs.type_cifs", - "nfs.type_lufs", - "nfs.type_nfs", - "nfs.umount", - "nfs.umounterror", - "nfs.username", - "nfsmenu.head", "nvod.percentage", "nvod.starting", "nvodselector.directormode",