EventLoop: un-inline Run() and others

Prepare for adding more code.

3 files changed, 62 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 1ec6db46a..898f1e094 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,7 +304,7 @@ libevent_a_SOURCES = \
 	src/event/FullyBufferedSocket.cxx src/event/FullyBufferedSocket.hxx \
 	src/event/MultiSocketMonitor.cxx src/event/MultiSocketMonitor.hxx \
 	src/event/ServerSocket.cxx src/event/ServerSocket.hxx \
-	src/event/Loop.hxx
+	src/event/Loop.cxx src/event/Loop.hxx
 
 # PCM library
 
diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx
new file mode 100644
index 000000000..1aaca8820
--- /dev/null
+++ b/src/event/Loop.cxx
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * 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 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.
+ */
+
+#include "config.h"
+#include "Loop.hxx"
+
+void
+EventLoop::Run()
+{
+	g_main_loop_run(loop);
+}
+
+guint
+EventLoop::AddIdle(GSourceFunc function, gpointer data)
+{
+	GSource *source = g_idle_source_new();
+	g_source_set_callback(source, function, data, NULL);
+	guint id = g_source_attach(source, GetContext());
+	g_source_unref(source);
+	return id;
+}
+
+GSource *
+EventLoop::AddTimeout(guint interval_ms,
+		      GSourceFunc function, gpointer data)
+{
+	GSource *source = g_timeout_source_new(interval_ms);
+	g_source_set_callback(source, function, data, nullptr);
+	g_source_attach(source, GetContext());
+	return source;
+}
+
+GSource *
+EventLoop::AddTimeoutSeconds(guint interval_s,
+			     GSourceFunc function, gpointer data)
+{
+	GSource *source = g_timeout_source_new_seconds(interval_s);
+	g_source_set_callback(source, function, data, nullptr);
+	g_source_attach(source, GetContext());
+	return source;
+}
diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index 72731ea2b..a222f098d 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -56,33 +56,15 @@ public:
 		g_main_loop_quit(loop);
 	}
 
-	void Run() {
-		g_main_loop_run(loop);
-	}
+	void Run();
 
-	guint AddIdle(GSourceFunc function, gpointer data) {
-		GSource *source = g_idle_source_new();
-		g_source_set_callback(source, function, data, NULL);
-		guint id = g_source_attach(source, GetContext());
-		g_source_unref(source);
-		return id;
-	}
+	guint AddIdle(GSourceFunc function, gpointer data);
 
 	GSource *AddTimeout(guint interval_ms,
-			    GSourceFunc function, gpointer data) {
-		GSource *source = g_timeout_source_new(interval_ms);
-		g_source_set_callback(source, function, data, nullptr);
-		g_source_attach(source, GetContext());
-		return source;
-	}
+			    GSourceFunc function, gpointer data);
 
 	GSource *AddTimeoutSeconds(guint interval_s,
-				   GSourceFunc function, gpointer data) {
-		GSource *source = g_timeout_source_new_seconds(interval_s);
-		g_source_set_callback(source, function, data, nullptr);
-		g_source_attach(source, GetContext());
-		return source;
-	}
+				   GSourceFunc function, gpointer data);
 };
 
 #endif /* MAIN_NOTIFY_H */