Merge lp:~chk2k2/me-tv/me-tv into lp:me-tv

[Christian]

fixes 3 bugs:
Bug #769574: reordering channels doesn't work
Bug #983673: me-tv-client doesn't interrupt screensaver
Bug #1414449: Help screen shows wrong version

[Frédéric Côté (frederic-cote)]

review: Approve

=== modified file 'client/Makefile.am'
--- client/Makefile.am	2012-03-11 22:20:20 +0000
+++ client/Makefile.am	2015-04-03 22:53:30 +0000
@@ -32,6 +32,8 @@
 	epg_event_dialog.h \
 	gstreamer_engine.h \
 	gstreamer_engine.cc \
+	inhibitscreensaver.h \
+	inhibitscreensaver.cc \
 	me-tv-client.cc \
 	main_window.cc \
 	main_window.h \

=== added file 'client/inhibitscreensaver.cc'
--- client/inhibitscreensaver.cc	1970-01-01 00:00:00 +0000
+++ client/inhibitscreensaver.cc	2015-04-03 22:53:30 +0000
@@ -0,0 +1,257 @@
+//
+// Inhibit Screen Saver
+//
+// Copyright (C) Joachim Erbs, 2010-2011
+//
+//    This file is part of Sinema.
+//
+//    Sinema 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
+//    (at your option) any later version.
+//
+//    Sinema 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 General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Sinema.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include "inhibitscreensaver.h"
+
+// -------------------------------------------------------------------
+// Determine which ScreenSaver interface has to be used (Gnome or KDE):
+//   gdbus introspect --session --dest org.freedesktop.DBus --object-path /
+//   gdbus call --session --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner org.gnome.ScreenSaver
+//   gdbus call --session --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner org.freedesktop.ScreenSaver
+//
+// Accessing the ScreenSaver:
+//   gdbus introspect --session --dest org.gnome.ScreenSaver --object-path /
+//   gdbus introspect --session --dest org.freedesktop.ScreenSaver --object-path /ScreenSaver
+//   gdbus call --session --dest org.gnome.ScreenSaver --object-path / --method org.gnome.ScreenSaver.SimulateUserActivity
+//   gdbus call --session --dest org.freedesktop.ScreenSaver  --object-path /ScreenSaver org.freedesktop.ScreenSaver.SimulateUserActivity
+//   At least the Gnome screen saver does not send a response for SimulateUserActivity.
+//
+// Monitoring DBus:
+//   gdbus monitor --session --dest org.gnome.ScreenSaver --object-path /
+//
+// Documentation:
+//   gdbus documentation: http://library.gnome.org/devel/gio/2.26/gdbus.html
+
+DBusScreenSaverInterface::DBusScreenSaverInterface()
+    : proxyDBusDaemon(0),
+      proxyScreenSaver(0),
+      screenSaver(0),
+      dbusDaemon
+	 {"org.freedesktop.DBus",
+	  "org.freedesktop.DBus",
+	  "/",
+	  "org.freedesktop.DBus.GetNameOwner",
+	  ""
+	},
+      freedesktopScreenSaver
+	 {"org.freedesktop.ScreenSaver",
+	  "org.freedesktop.ScreenSaver",
+	  "/ScreenSaver",
+	  "org.freedesktop.ScreenSaver.Inhibit",
+	  "org.freedesktop.ScreenSaver.UnInhibit" 
+	}
+{
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION,
+			     G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+			     NULL,  // GDBusInterfaceInfo*
+			     dbusDaemon.bus_name,
+			     dbusDaemon.object_path,
+			     dbusDaemon.interface_name,
+			     NULL, // GCancellable*
+			     &wrapper<DBusScreenSaverInterface,
+			              &DBusScreenSaverInterface::finishProxyDBusDaemonNew>,
+			     this);
+}
+
+DBusScreenSaverInterface::~DBusScreenSaverInterface()
+{
+    // Fixme: Cancel open asynchronous operations before deleting the object.
+
+    if (proxyDBusDaemon)
+	g_object_unref(proxyDBusDaemon);
+
+    if (proxyScreenSaver)
+	g_object_unref(proxyScreenSaver);
+}
+
+void DBusScreenSaverInterface::finishProxyDBusDaemonNew(GObject*,  // source_object
+							GAsyncResult *res)
+{
+    GError* error = NULL;
+    proxyDBusDaemon = g_dbus_proxy_new_for_bus_finish(res, &error);
+    if (proxyDBusDaemon)
+    {
+	g_debug("DBus Proxy Daemon creation successfull");
+	screenSaver = &freedesktopScreenSaver;
+	sendDBusDaemonGetNameOwner();
+    }
+    else
+    {
+	g_debug("DBus Proxy Daemon creation successfull");
+    }
+}
+
+void DBusScreenSaverInterface::sendDBusDaemonGetNameOwner()
+{
+    g_debug("DBus Proxy checking: %s",screenSaver->bus_name);
+    g_dbus_proxy_call(proxyDBusDaemon,
+		      dbusDaemon.method_name_inhibit,
+		      g_variant_new ("(s)", screenSaver->bus_name),
+		      G_DBUS_CALL_FLAGS_NO_AUTO_START,
+		      500,   // timeout in milliseconds, -1 use the proxy default timeout
+		      NULL,  //  GCancellable*
+		      &wrapper<DBusScreenSaverInterface,
+		               &DBusScreenSaverInterface::finishDBusDaemonGetNameOwner>,
+		      this);
+}
+
+void DBusScreenSaverInterface::finishDBusDaemonGetNameOwner(GObject*,  // source_object
+							    GAsyncResult *res)
+{
+    GError* error = NULL;
+    GVariant* gvariant = g_dbus_proxy_call_finish(proxyDBusDaemon, res, &error);
+
+    if (error != NULL)
+    {
+	g_debug("DBus Proxy error callingdomain: %d, code: %d, message: %s", error->domain, error->code, error->message);
+	g_error_free(error);
+
+	if (screenSaver == &freedesktopScreenSaver)
+	{
+	    g_debug("DBus Proxy search failed: %s",screenSaver->bus_name);
+// 	    screenSaver = &gnomeScreenSaver;
+// 	    sendDBusDaemonGetNameOwner();
+	}
+	else
+	{
+	    // No DBus screen saver found.
+	    g_debug("DBus Proxy search failed: %s",screenSaver->bus_name);
+	}
+    }
+    else
+    {
+	g_debug("DBus Proxy found: %s",screenSaver->bus_name);
+	if (gvariant)
+	{
+	    g_variant_unref(gvariant);
+	}
+
+	// Create DBus proxy for screen saver.
+	g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION,
+				 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+				 NULL,  // GDBusInterfaceInfo*
+				 screenSaver->bus_name,
+				 screenSaver->object_path,
+				 screenSaver->interface_name,
+				 NULL, // GCancellable*
+				 &wrapper<DBusScreenSaverInterface,
+				          &DBusScreenSaverInterface::finishProxyScreenSaverNew>,
+				 this);
+    }
+}
+
+void DBusScreenSaverInterface::finishProxyScreenSaverNew(GObject*,  // source_object
+							 GAsyncResult *res)
+{
+    GError* error = NULL;
+    proxyScreenSaver = g_dbus_proxy_new_for_bus_finish(res, &error);
+    if (error != NULL)
+    {
+	g_debug("DBus Proxy error callingdomain: %d, code: %d, message: %s", error->domain, error->code, error->message);
+	g_error_free(error);
+    }
+    else if (proxyScreenSaver)
+    {
+	g_debug("DBus Proxy created: %s",screenSaver->bus_name);
+    }
+    else
+    {
+	g_debug("DBus Proxy creation failed: %s",screenSaver->bus_name);
+    }
+}
+
+void DBusScreenSaverInterface::inhibit()
+{
+    if (proxyScreenSaver)
+    {
+	g_debug("DBus Inhibit ScreenSaver");
+	g_dbus_proxy_call(proxyScreenSaver,
+			  screenSaver->method_name_inhibit,
+			  g_variant_new("(ss)",
+			    g_get_application_name (),
+			    "showing TV stream"),
+			  G_DBUS_CALL_FLAGS_NO_AUTO_START,
+			  500,   // timeout in milliseconds, -1 use the proxy default timeout
+			  NULL,  // GCancellable*
+			  &wrapper<DBusScreenSaverInterface,
+				          &DBusScreenSaverInterface::finishInhibit>,
+			  this);
+    }
+}
+
+void DBusScreenSaverInterface::finishInhibit (GObject * source_object, GAsyncResult * res)
+{
+    GError* error = NULL;
+    GVariant *value;
+
+    value = g_dbus_proxy_call_finish (proxyScreenSaver, res, &error);
+    if (!value) {
+      g_warning ("Problem inhibiting the screensaver: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+    /* save the cookie */
+    if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(u)"))) {
+        g_variant_get (value, "(u)", &cookie);
+    }else
+      cookie = 0;
+
+    g_debug("DBus Inhibit ScreenSaver successfull with cookie: %d",cookie);
+    g_variant_unref (value);
+}
+
+void DBusScreenSaverInterface::uninhibit()
+{
+    if (proxyScreenSaver && (cookie>0))
+    {
+	g_debug("DBus UnInhibit ScreenSaver");
+	g_dbus_proxy_call(proxyScreenSaver,
+			  screenSaver->method_name_uninhibit,
+			  g_variant_new ("(u)", cookie),
+			  G_DBUS_CALL_FLAGS_NO_AUTO_START,
+			  500,   // timeout in milliseconds, -1 use the proxy default timeout
+			  NULL,  // GCancellable*
+			  &wrapper<DBusScreenSaverInterface,
+				          &DBusScreenSaverInterface::finishUninhibit>,
+			  this);
+    }
+}
+
+void DBusScreenSaverInterface::finishUninhibit (GObject * source_object, GAsyncResult * res)
+{
+    GError* error = NULL;
+    GVariant *value;
+
+    value = g_dbus_proxy_call_finish (proxyScreenSaver, res, &error);
+    if (!value) {
+      g_warning ("Problem uninhibiting the screensaver: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+    /* clear the cookie */
+    cookie = 0;
+    
+    g_debug("DBus UnInhibit ScreenSaver successfull");
+    g_variant_unref (value);
+}
+// -------------------------------------------------------------------

=== added file 'client/inhibitscreensaver.h'
--- client/inhibitscreensaver.h	1970-01-01 00:00:00 +0000
+++ client/inhibitscreensaver.h	2015-04-03 22:53:30 +0000
@@ -0,0 +1,74 @@
+//
+// Inhibit Screen Saver
+//
+// Copyright (C) Joachim Erbs, 2010-2011
+//
+//    This file is part of Sinema.
+//
+//    Sinema 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
+//    (at your option) any later version.
+//
+//    Sinema 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 General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Sinema.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INHIBIT_SCREEN_SAVER_H
+#define INHIBIT_SCREEN_SAVER_H
+
+#include <gio/gio.h>
+
+// -------------------------------------------------------------------
+
+class DBusScreenSaverInterface
+{
+public:
+    DBusScreenSaverInterface();
+    ~DBusScreenSaverInterface();
+
+    void inhibit();
+    void uninhibit();
+
+private:
+    template<typename C, void(C::*M)(GObject*, GAsyncResult*)>
+    static void wrapper(GObject *source_object,
+			GAsyncResult *res,
+			gpointer user_data)
+    {
+	C* obj = (C*)user_data;
+	(obj->*M)(source_object, res);
+    }
+
+    struct DBusMethod
+    {
+	const gchar* bus_name;
+	const gchar* interface_name;
+	const gchar* object_path;
+	const gchar* method_name_inhibit;
+	const gchar* method_name_uninhibit;
+    };
+
+    GDBusProxy* proxyDBusDaemon;
+    GDBusProxy* proxyScreenSaver;
+    const DBusMethod* screenSaver;
+    guint32 cookie;
+
+    const DBusMethod dbusDaemon;
+    const DBusMethod freedesktopScreenSaver;
+
+    void finishProxyDBusDaemonNew(GObject*, GAsyncResult *res);
+    void sendDBusDaemonGetNameOwner();
+    void finishDBusDaemonGetNameOwner(GObject*, GAsyncResult *res);
+    void finishProxyScreenSaverNew(GObject*, GAsyncResult *res);
+    
+    void finishUninhibit (GObject * source_object, GAsyncResult * res);
+    void finishInhibit (GObject * source_object, GAsyncResult * res);
+};
+
+#endif

=== modified file 'client/main_window.cc'
--- client/main_window.cc	2012-12-08 23:09:19 +0000
+++ client/main_window.cc	2015-04-03 22:53:30 +0000
@@ -94,6 +94,8 @@
 	GdkPixmap* pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1);
 	hidden_cursor = gdk_cursor_new_from_pixmap(pixmap, pixmap, &color, &color, 0, 0);
 
+	inhibitScreenSaver = new DBusScreenSaverInterface();
+	
 	g_debug("Loading UI files");
 	
 	add_accel_group(ui_manager->get_accel_group());
@@ -281,6 +283,8 @@
 void MainWindow::unfullscreen(gboolean restore_mode)
 {
 	Gtk::Window::unfullscreen();
+	inhibitScreenSaver->uninhibit();
+
 	label_time->hide();
 	
 	if (restore_mode)
@@ -298,6 +302,7 @@
 	}
 	label_time->show();
 	
+	inhibitScreenSaver->inhibit();
 	Gtk::Window::fullscreen();
 }
 

=== modified file 'client/main_window.h'
--- client/main_window.h	2011-12-24 22:18:13 +0000
+++ client/main_window.h	2015-04-03 22:53:30 +0000
@@ -23,7 +23,7 @@
 
 #include "me-tv.h"
 #include "engine.h"
-#include <dbus/dbus.h>
+#include "inhibitscreensaver.h"
 #include <gtkmm/volumebutton.h>
 
 typedef enum
@@ -63,6 +63,7 @@
 	Gtk::Label*							label_epg_page;
 	Gtk::Table*							table_epg;
 	Gtk::ScrolledWindow*				scrolled_window_epg;
+	DBusScreenSaverInterface*					inhibitScreenSaver;
 	
 	void stop();
 	void set_view_mode(ViewMode display_mode);

=== modified file 'client/me-tv-client.1'
--- client/me-tv-client.1	2011-12-24 22:18:13 +0000
+++ client/me-tv-client.1	2015-04-03 22:53:30 +0000
@@ -1,22 +1,24 @@
 .pc
-.TH "ME TV" 1 "2011-03-31" "2.0.0" "Me TV Client Manual"
+.TH "ME TV" 1 "2015-03-26" "1.4.0" "Me TV Client Manual"
 
 .SH NAME
 me-tv-client \- a digital television (DVB) viewer for GNOME
 
 .SH SYNOPSIS
-.B me-tv
-.I [-?|--help]
+.B me-tv-client
+.I [-?|-h|--help]
 .I [-v|--verbose]
 .I [-s|--safe-mode]
-.I [-m|--minimised]
 .I [--disable-epg]
+.I [--engine]
 .I [--no-screensaver-inhibit]
 .I [--display=DISPLAY]
+.I [--server-host]
+.I [--server-port]
 
 .SH DESCRIPTION
 Me TV is a GTK desktop application for watching digital television services 
-that use the DVB standard.  Me TV works with DVB-T/C/S and ATSC cards that have 
+that use the DVB standard. Me TV works with DVB-T/C/S and ATSC cards that have 
 kernel driver support.
 
 .SH OPTIONS
@@ -30,17 +32,23 @@
 .B -s|--safe-mode
 Show the preferences dialog an don't show video upon start.
 .TP
-.B -m|--minimised-mode
-Show minimised in notification area at startup.
-.TP
 .B --disable-epg
 Stops the rendering of the EPG event buttons on the UI.
 .TP
+.B --engine
+Specify engine type gstreamer or vlc (default: vlc).
+.TP
 .B --no-screensaver-inhibit
 Tells Me TV not to call the screensaver Inhibit/UnInhibit methods for GNOME Screensaver.
 .TP
 .B --display=DISPLAY
 X display to use
+.TP
+.B --server-host
+Me TV server host (default: localhost)
+.TP
+.B --server-port
+Me TV server port (default: 1999)
 
 .SH AUTHOR
 Michael Lamothe (2007-2011) <[e-mail]>.

=== modified file 'client/me-tv-client.cc'
--- client/me-tv-client.cc	2012-12-08 23:09:19 +0000
+++ client/me-tv-client.cc	2015-04-03 22:53:30 +0000
@@ -26,7 +26,6 @@
 #include <glib/gprintf.h>
 #include <X11/Xlib.h>
 #include <unique/unique.h>
-#include <dbus/dbus-glib.h>
 #include "me-tv-ui.h"
 #include "configuration_manager.h"
 #include "../common/exception.h"
@@ -45,7 +44,7 @@
 	UniqueResponse response = UNIQUE_RESPONSE_FAIL;
 
 	switch (command)
-    {
+	{
 		case 1:
 			action_present->activate();
 			response = UNIQUE_RESPONSE_OK;
@@ -101,15 +100,6 @@
 	safe_mode_option_entry.set_short_name('s');
 	safe_mode_option_entry.set_description(_("Start in safe mode"));
 
-	Glib::OptionEntry minimised_option_entry;
-	minimised_option_entry.set_long_name("minimised");
-	minimised_option_entry.set_short_name('m');
-	minimised_option_entry.set_description(_("Start minimised in notification area"));
-
-	Glib::OptionEntry disable_epg_thread_option_entry;
-	disable_epg_thread_option_entry.set_long_name("disable-epg-thread");
-	disable_epg_thread_option_entry.set_description(_("Disable the EPG thread.  Me TV will stop collecting EPG events."));
-
 	Glib::OptionEntry disable_epg_option_entry;
 	disable_epg_option_entry.set_long_name("disable-epg");
 	disable_epg_option_entry.set_description(_("Stops the rendering of the EPG event buttons on the UI."));
@@ -123,10 +113,6 @@
 	no_screensaver_inhibit_option_entry.set_long_name("no-screensaver-inhibit");
 	no_screensaver_inhibit_option_entry.set_description(_("Tells Me TV not to call the screensaver Inhibit/UnInhibit methods for GNOME Screensaver."));
 
-	Glib::OptionEntry devices_option_entry;
-	devices_option_entry.set_long_name("devices");
-	devices_option_entry.set_description(_("Only use the specified frontend devices (e.g. --devices=/dev/dvb/adapter0/frontend0,/dev/dvb/adapter0/frontend1)"));
-
 	Glib::OptionEntry host_option_entry;
 	host_option_entry.set_long_name("server-host");
 	host_option_entry.set_description(_("Me TV server host (default: localhost)"));
@@ -135,19 +121,11 @@
 	port_option_entry.set_long_name("server-port");
 	port_option_entry.set_description(_("Me TV server port (default: 1999)"));
 
-	Glib::OptionEntry read_timeout_option_entry;
-	read_timeout_option_entry.set_long_name("read-timeout");
-	read_timeout_option_entry.set_description(_("How long to wait (in seconds) before timing out while waiting for data from demuxer (default 5)."));
-	
 	Glib::OptionGroup option_group(PACKAGE_NAME, "", _("Show Me TV help options"));
 	option_group.add_entry(verbose_option_entry, verbose_logging);
 	option_group.add_entry(safe_mode_option_entry, safe_mode);
-	option_group.add_entry(minimised_option_entry, minimised_mode);
-	option_group.add_entry(disable_epg_thread_option_entry, disable_epg_thread);
 	option_group.add_entry(disable_epg_option_entry, disable_epg);
 	option_group.add_entry(no_screensaver_inhibit_option_entry, no_screensaver_inhibit);
-	option_group.add_entry(devices_option_entry, devices);
-	option_group.add_entry(read_timeout_option_entry, read_timeout);
 	option_group.add_entry(host_option_entry, server_host);
 	option_group.add_entry(port_option_entry, server_port);
 	option_group.add_entry(engine_option_entry, engine_type);
@@ -235,13 +213,6 @@
 
 			ui_manager = Gtk::UIManager::create();
 			ui_manager->insert_action_group(action_group);
-			
-			GError *error = NULL;
-			DBusGConnection* dbus_connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-			if (dbus_connection == NULL)
-			{
-				g_message(_("Failed to get DBus session"));
-			}
 
 			configuration_manager.initialise();
 			client.register_client(server_host, server_port);

=== modified file 'client/me-tv.cc'
--- client/me-tv.cc	2012-03-17 14:07:31 +0000
+++ client/me-tv.cc	2015-04-03 22:53:30 +0000
@@ -25,12 +25,8 @@
 
 bool			verbose_logging			= false;
 bool			safe_mode				= false;
-bool			minimised_mode			= false;
-bool			disable_epg_thread		= false;
 bool			disable_epg				= false;
 bool			no_screensaver_inhibit	= false;
-Glib::ustring	devices;
-gint			read_timeout			= 5;
 Glib::ustring	server_host				= "localhost";
 gint			server_port				= 1999;
 Glib::ustring	engine_type				= "vlc";

=== modified file 'client/me-tv.h'
--- client/me-tv.h	2012-03-11 22:20:20 +0000
+++ client/me-tv.h	2015-04-03 22:53:30 +0000
@@ -31,12 +31,8 @@
 
 extern bool				verbose_logging;
 extern bool				safe_mode;
-extern bool				minimised_mode;
-extern bool				disable_epg_thread;
 extern bool				disable_epg;
 extern bool				no_screensaver_inhibit;
-extern Glib::ustring	devices;
-extern gint				read_timeout;
 extern Glib::ustring	server_host;
 extern gint				server_port;
 extern Glib::ustring	engine_type;

=== modified file 'configure.ac'
--- configure.ac	2012-12-29 22:49:32 +0000
+++ configure.ac	2015-04-03 22:53:30 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.53)
-AC_INIT([Me TV], [1.4.0.12], [http://launchpad.net/me-tv], me-tv)
+AC_INIT([Me TV], [1.4.0.58], [http://launchpad.net/me-tv], me-tv)
 AC_COPYRIGHT([Michael Lamothe <[e-mail]>])
 AM_INIT_AUTOMAKE([1.9 foreign])
 AC_GNU_SOURCE

=== modified file 'server/channel_manager.cc'
--- server/channel_manager.cc	2012-06-10 20:50:55 +0000
+++ server/channel_manager.cc	2015-04-03 22:53:30 +0000
@@ -271,6 +271,23 @@
 	return *channel;
 }
 
+Channel& ChannelManager::get_channel_by_name(Glib::ustring name)
+{
+	Glib::RecMutex::Lock lock(mutex);
+
+	Channel* channel = NULL;
+
+	for (ChannelList::iterator iterator = channels.begin(); iterator != channels.end() && channel == NULL; iterator++)
+	{
+		if ((*iterator).name == name)
+		{
+			channel = &(*iterator);
+		}
+	}
+
+	return *channel;
+}
+
 Channel& ChannelManager::get_channel_by_id(guint channel_id)
 {
 	Glib::RecMutex::Lock lock(mutex);

=== modified file 'server/channel_manager.h'
--- server/channel_manager.h	2011-12-24 22:18:13 +0000
+++ server/channel_manager.h	2015-04-03 22:53:30 +0000
@@ -53,6 +53,7 @@
 
 	Channel& get_channel_by_id(guint channel_id);
 	Channel& get_channel_by_index(guint number);
+	Channel& get_channel_by_name(Glib::ustring name);
 	Channel* find_channel(guint frequency, guint service_id);
 	Channel* find_channel(guint channel_id);
 

=== modified file 'server/me-tv-server.1'
--- server/me-tv-server.1	2011-12-24 22:18:13 +0000
+++ server/me-tv-server.1	2015-04-03 22:53:30 +0000
@@ -1,16 +1,18 @@
 .pc
-.TH "ME TV" 1 "2011-03-31" "2.0.0" "Me TV Server Manual"
+.TH "ME TV" 1 "2015-03-26" "1.4.0" "Me TV Server Manual"
 
 .SH NAME
 me-tv-server \- a digital television (DVB) viewer for GNOME
 
 .SH SYNOPSIS
 .B me-tv-server
-.I [-?|--help]
+.I [-?|-h|--help]
 .I [-v|--verbose]
 .I [--disable-epg-thread]
 .I [--devices]
 .I [--read-timeout]
+.I [--broadcast-address]
+.I [--server-port]
 
 .SH DESCRIPTION
 Me TV is a GTK desktop application for watching digital television services 
@@ -35,6 +37,12 @@
 .TP
 .B --read-timeout
 How long to wait (in seconds) before timing out while waiting for data from demuxer (default 5)
+.TP
+.B --broadcast-address
+The network broadcast address to send video streams for clients to display (default 127.0.0.1).
+.TP
+.B --server-port
+The network port for clients to connect to (default 1999).
 
 .SH AUTHOR
 Michael Lamothe (2007-2011) <[e-mail]>.

=== modified file 'server/request_handler.cc'
--- server/request_handler.cc	2012-03-17 16:43:02 +0000
+++ server/request_handler.cc	2015-04-03 22:53:30 +0000
@@ -262,7 +262,23 @@
 		}
 		else if (command == "set_channel_order")
 		{
-
+			ChannelList newchannels;
+			
+			NodeSet nodes = root_node->find("parameter");
+			for (NodeSet::iterator i = nodes.begin(); i != nodes.end(); i++)
+			{
+				Node* node = *i;
+				
+				const Glib::ustring& name = get_attribute_value(node, "@name");
+				const Glib::ustring& value = get_attribute_value(node, "@value");
+				
+				newchannels.push_back(channel_manager.get_channel_by_name(name));
+
+				Glib::ustring s = Glib::ustring::compose(" name=%1 -- value=%2", name, value);
+				g_debug(s.c_str());
+			}
+
+			channel_manager.set_channels(schema, connection, newchannels);
 		}
 		else if (command == "get_epg")
 		{