Merge ~morphis/aethercast/+git/aethercast:rename-to-streamer into aethercast:master

[Simon Fels]

Rename mirscreencast_to_stream to aethercast-streamer

The rename was overdue for a long time.

This MP also serves as a testing point for the new git support just being added to citrain.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

Unmerged commits

9ae31ba... by Simon Fels on 2016-08-31

Rename mirscreencast_to_stream to aethercast-streamer

diff --git a/debian/aethercast-tools.install b/debian/aethercast-tools.install
index 1ff7ff0..a00e91a 100644
--- a/debian/aethercast-tools.install
+++ b/debian/aethercast-tools.install
@@ -1,2 +1,2 @@
-usr/bin/mirscreencast_to_stream
+usr/bin/aethercast-streamer
 usr/lib/*/aethercast/tools/libaethercast-lttng.so
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 178ad9d..eaf863e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -21,16 +21,16 @@ include_directories(
   ${GST_INCLUDE_DIRS}
 )
 
-set(MIRSCREENCAST_TO_STREAM_SOURCES
+set(AETHERCAST_STREAMER_SOURCES
     simplesource.cpp
-    mirscreencast_to_stream.cpp)
+    streamer.cpp)
 
-add_executable(mirscreencast_to_stream
-    ${MIRSCREENCAST_TO_STREAM_SOURCES})
-target_link_libraries(mirscreencast_to_stream aethercast-core)
+add_executable(aethercast-streamer
+    ${AETHERCAST_STREAMER_SOURCES})
+target_link_libraries(aethercast-streamer aethercast-core)
 
 install(
-  TARGETS mirscreencast_to_stream
+  TARGETS aethercast-streamer
   RUNTIME DESTINATION bin
 )
 
diff --git a/tools/mirscreencast_to_stream.cpp b/tools/mirscreencast_to_stream.cpp
deleted file mode 100644
index 503dcee..0000000
--- a/tools/mirscreencast_to_stream.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (C) 2016 Canonical, Ltd.
- *
- *  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 St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <string>
-#include <iostream>
-#include <chrono>
-
-#include <boost/program_options.hpp>
-
-#include <ac/logger.h>
-#include <ac/glib_wrapper.h>
-
-#include "simplesource.h"
-
-static GMainLoop *main_loop = nullptr;
-
-namespace {
-const std::chrono::seconds kShutdownGracePreriod{1};
-const std::int16_t kProcessPriorityUrgentDisplay{-8};
-ac::tools::SimpleSource::Ptr source;
-
-static gboolean OnSignalRaised(gpointer user_data) {
-    AC_DEBUG("Exiting");
-
-    g_timeout_add_seconds(kShutdownGracePreriod.count(), [](gpointer user_data) {
-        g_main_loop_quit(main_loop);
-        return FALSE;
-    }, nullptr);
-
-    // This will bring down the whole pipeline and terminate everything
-    // correctly.
-    source.reset();
-
-    // A second SIGTERM should really terminate us and also overlay
-    // the grace period for a proper shutdown we're performing.
-    return FALSE;
-}
-}
-
-int main(int argc, char **argv) {
-    std::string remote_address;
-    int port = 0;
-    bool debug = false;
-
-    g_unix_signal_add(SIGINT, OnSignalRaised, nullptr);
-    g_unix_signal_add(SIGTERM, OnSignalRaised, nullptr);
-
-    main_loop = g_main_loop_new(nullptr, FALSE);
-
-    boost::program_options::options_description desc("Usage");
-    desc.add_options()
-        ("help,h", "displays this message")
-        ("remote,r",
-            boost::program_options::value<std::string>(&remote_address), "Remote host address")
-        ("port,p",
-            boost::program_options::value<int>(&port), "Port to use")
-        ("debug,d",
-            boost::program_options::bool_switch(&debug), "Enable verbose debug output");
-
-    boost::program_options::variables_map vm;
-    try {
-        boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
-        boost::program_options::notify(vm);
-    }
-    catch(boost::program_options::error& e) {
-        std::cerr << e.what() << std::endl << std::endl;
-        std::cerr << desc << std::endl;
-        return EXIT_FAILURE;
-    }
-
-    if (vm.count("help")) {
-        std::cout << desc << std::endl;
-        return EXIT_SUCCESS;
-    }
-
-    if (remote_address.length() == 0)
-        throw std::runtime_error("Invalid address supplied");
-
-    if (port == 0)
-        throw std::runtime_error("Invalid or no port supplied");
-
-    setpriority(PRIO_PROCESS, 0, kProcessPriorityUrgentDisplay);
-
-    if (debug)
-        ac::Log().Init(ac::Logger::Severity::kDebug);
-
-    source = ac::tools::SimpleSource::Create(remote_address, port);
-    source->Start();
-
-    g_main_loop_run(main_loop);
-
-    g_main_loop_unref(main_loop);
-
-    return EXIT_SUCCESS;
-}
diff --git a/tools/streamer.cpp b/tools/streamer.cpp
new file mode 100644
index 0000000..503dcee
--- /dev/null
+++ b/tools/streamer.cpp
@@ -0,0 +1,116 @@
+/*
+ *  Copyright (C) 2016 Canonical, Ltd.
+ *
+ *  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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include <string>
+#include <iostream>
+#include <chrono>
+
+#include <boost/program_options.hpp>
+
+#include <ac/logger.h>
+#include <ac/glib_wrapper.h>
+
+#include "simplesource.h"
+
+static GMainLoop *main_loop = nullptr;
+
+namespace {
+const std::chrono::seconds kShutdownGracePreriod{1};
+const std::int16_t kProcessPriorityUrgentDisplay{-8};
+ac::tools::SimpleSource::Ptr source;
+
+static gboolean OnSignalRaised(gpointer user_data) {
+    AC_DEBUG("Exiting");
+
+    g_timeout_add_seconds(kShutdownGracePreriod.count(), [](gpointer user_data) {
+        g_main_loop_quit(main_loop);
+        return FALSE;
+    }, nullptr);
+
+    // This will bring down the whole pipeline and terminate everything
+    // correctly.
+    source.reset();
+
+    // A second SIGTERM should really terminate us and also overlay
+    // the grace period for a proper shutdown we're performing.
+    return FALSE;
+}
+}
+
+int main(int argc, char **argv) {
+    std::string remote_address;
+    int port = 0;
+    bool debug = false;
+
+    g_unix_signal_add(SIGINT, OnSignalRaised, nullptr);
+    g_unix_signal_add(SIGTERM, OnSignalRaised, nullptr);
+
+    main_loop = g_main_loop_new(nullptr, FALSE);
+
+    boost::program_options::options_description desc("Usage");
+    desc.add_options()
+        ("help,h", "displays this message")
+        ("remote,r",
+            boost::program_options::value<std::string>(&remote_address), "Remote host address")
+        ("port,p",
+            boost::program_options::value<int>(&port), "Port to use")
+        ("debug,d",
+            boost::program_options::bool_switch(&debug), "Enable verbose debug output");
+
+    boost::program_options::variables_map vm;
+    try {
+        boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
+        boost::program_options::notify(vm);
+    }
+    catch(boost::program_options::error& e) {
+        std::cerr << e.what() << std::endl << std::endl;
+        std::cerr << desc << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    if (vm.count("help")) {
+        std::cout << desc << std::endl;
+        return EXIT_SUCCESS;
+    }
+
+    if (remote_address.length() == 0)
+        throw std::runtime_error("Invalid address supplied");
+
+    if (port == 0)
+        throw std::runtime_error("Invalid or no port supplied");
+
+    setpriority(PRIO_PROCESS, 0, kProcessPriorityUrgentDisplay);
+
+    if (debug)
+        ac::Log().Init(ac::Logger::Severity::kDebug);
+
+    source = ac::tools::SimpleSource::Create(remote_address, port);
+    source->Start();
+
+    g_main_loop_run(main_loop);
+
+    g_main_loop_unref(main_loop);
+
+    return EXIT_SUCCESS;
+}