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

Merge branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-11 00:40:30 +01:00
parent 19000c33bd a3aa254535
commit fbee2df820
55 changed files with 1446 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/system/configure_network.cpp
View File

@@ -6,7 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -217,11 +217,11 @@ void CNetworkConfig::commitConfig(void)
void CNetworkConfig::startNetwork(void)
{
const char _ifup[] = "/sbin/ifup";
std::string cmd = "/sbin/ifup " + ifname;
#ifdef DEBUG
printf("CNetworkConfig::startNetwork: %s %s\n",_ifup, ifname.c_str());
printf("CNetworkConfig::startNetwork: %s\n", cmd.c_str());
#endif
my_system(_ifup, ifname.c_str());
my_system("/bin/sh", "-c", cmd.c_str());
if (!inet_static) {
init_vars();
@@ -231,11 +231,11 @@ void CNetworkConfig::startNetwork(void)
void CNetworkConfig::stopNetwork(void)
{
const char _ifdown[] = "/sbin/ifdown";
std::string cmd = "/sbin/ifdown " + ifname;
#ifdef DEBUG
printf("CNetworkConfig::stopNetwork: %s %s\n",_ifdown, ifname.c_str());
printf("CNetworkConfig::stopNetwork: %s\n", cmd.c_str());
#endif
my_system(_ifdown, ifname.c_str());
my_system("/bin/sh", "-c", cmd.c_str());
}