diff --git a/common/channel_manager.cc b/common/channel_manager.cc index 33d9cfd..88d4089 100644 --- a/common/channel_manager.cc +++ b/common/channel_manager.cc @@ -19,7 +19,7 @@ */ #include "channel_manager.h" -#include "global.h" +#include "common.h" #include "i18n.h" #include "exception.h" diff --git a/common/channels_conf_line.h b/common/channels_conf_line.h index 4050581..492b8a1 100644 --- a/common/channels_conf_line.h +++ b/common/channels_conf_line.h @@ -21,7 +21,7 @@ #ifndef CHANNELS_CONF_LINE #define CHANNELS_CONF_LINE -#include "global.h" +#include "common.h" #include struct StringTable diff --git a/common/dvb_si.h b/common/dvb_si.h index 5d2f275..15b3f63 100644 --- a/common/dvb_si.h +++ b/common/dvb_si.h @@ -26,7 +26,7 @@ #include #include #include -#include "global.h" +#include "common.h" #include "i18n.h" #define DVB_SECTION_BUFFER_SIZE 16*1024 diff --git a/common/epg_events.cc b/common/epg_events.cc index d214f4c..eac6469 100644 --- a/common/epg_events.cc +++ b/common/epg_events.cc @@ -20,7 +20,6 @@ #include "epg_events.h" #include "data.h" -#include "global.h" #include "common.h" #include "exception.h" diff --git a/common/global.cc b/common/global.cc deleted file mode 100644 index ee6bea9..0000000 --- a/common/global.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2011 Michael Lamothe - * - * This file is part of Me TV - * - * 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 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA - */ - -ChannelManager channel_manager; -ScheduledRecordingManager scheduled_recording_manager; -DeviceManager device_manager; -StreamManager stream_manager; -RequestHandler request_handler; -Glib::RefPtr data_connection; - -String preferred_language; -Glib::StaticRecMutex mutex; -bool verbose_logging = false; -bool disable_epg_thread = false; -String devices; -String text_encoding; -gboolean ignore_teletext = true; -String recording_directory; -int read_timeout = 5000; -int server_port = 1999; - diff --git a/common/global.h b/common/global.h deleted file mode 100644 index 202ae81..0000000 --- a/common/global.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2011 Michael Lamothe - * - * This file is part of Me TV - * - * 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 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA - */ - -#ifndef __GLOBAL_H__ -#define __GLOBAL_H__ - -#include -#include "../common/me-tv-types.h" -#include "channel_manager.h" -#include "scheduled_recording_manager.h" -#include "stream_manager.h" -#include "device_manager.h" -#include "data.h" - -extern bool verbose_logging; -extern bool disable_epg_thread; -extern bool disable_epg; -extern String devices; -extern String preferred_language; -extern int read_timeout; -extern String server_address; -extern int server_port; -extern String recording_directory; -extern guint record_extra_before; -extern guint record_extra_after; -extern sigc::signal signal_update; -extern sigc::signal signal_error; - -extern ChannelManager channel_manager; -extern ScheduledRecordingManager scheduled_recording_manager; -extern DeviceManager device_manager; -extern StreamManager stream_manager; -extern Glib::RefPtr data_connection; - -#endif diff --git a/common/mpeg_stream.cc b/common/mpeg_stream.cc index 34c11ec..7212707 100644 --- a/common/mpeg_stream.cc +++ b/common/mpeg_stream.cc @@ -21,7 +21,7 @@ #include #include "mpeg_stream.h" #include "exception.h" -#include "global.h" +#include "common.h" #include "crc32.h" Mpeg::Stream::Stream() diff --git a/common/network_server_thread.cc b/common/network_server_thread.cc index ad28633..d749187 100644 --- a/common/network_server_thread.cc +++ b/common/network_server_thread.cc @@ -19,7 +19,6 @@ */ #include "network_server_thread.h" -#include "global.h" #include "exception.h" #include "common.h" #include diff --git a/common/request_handler.cc b/common/request_handler.cc index 5155346..4e6dd36 100644 --- a/common/request_handler.cc +++ b/common/request_handler.cc @@ -20,9 +20,8 @@ #include "request_handler.h" #include "exception.h" -#include "common.h" #include "epg_events.h" -#include "global.h" +#include "common.h" #include "channels_conf_line.h" using namespace xmlpp; diff --git a/common/scheduled_recording_manager.cc b/common/scheduled_recording_manager.cc index 315cc61..6e92777 100644 --- a/common/scheduled_recording_manager.cc +++ b/common/scheduled_recording_manager.cc @@ -21,7 +21,6 @@ #include "scheduled_recording_manager.h" #include "exception.h" #include "i18n.h" -#include "global.h" #include "epg_events.h" #include "common.h" diff --git a/common/stream_manager.cc b/common/stream_manager.cc index af7b938..61cc1ce 100644 --- a/common/stream_manager.cc +++ b/common/stream_manager.cc @@ -20,7 +20,7 @@ #include #include "stream_manager.h" -#include "global.h" +#include "common.h" #include "device_manager.h" #include "dvb_transponder.h" #include "dvb_si.h"