aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-07-27 11:01:30 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-07-27 11:01:30 -0500
commitb0936139bfef6fe169b5c17be4b2dafa3c2e2c3a (patch)
treee4c9149fc11dca4d607066053258884dba0efec1 /src
parent7271b2139a5c600a2c3cdb4e552e05ddb0f374dd (diff)
downloadayatana-indicator-datetime-b0936139bfef6fe169b5c17be4b2dafa3c2e2c3a.tar.gz
ayatana-indicator-datetime-b0936139bfef6fe169b5c17be4b2dafa3c2e2c3a.tar.bz2
ayatana-indicator-datetime-b0936139bfef6fe169b5c17be4b2dafa3c2e2c3a.zip
copyediting: comments, use anonymous namespace
Diffstat (limited to 'src')
-rw-r--r--src/awake.cpp14
-rw-r--r--src/notifications.cpp27
-rw-r--r--src/snap.cpp11
-rw-r--r--src/sound.cpp25
4 files changed, 39 insertions, 38 deletions
diff --git a/src/awake.cpp b/src/awake.cpp
index 19826ae..57358ab 100644
--- a/src/awake.cpp
+++ b/src/awake.cpp
@@ -58,7 +58,9 @@ public:
private:
- static void on_system_bus_ready (GObject *, GAsyncResult *res, gpointer gself)
+ static void on_system_bus_ready (GObject *,
+ GAsyncResult *res,
+ gpointer gself)
{
GError * error;
GDBusConnection * system_bus;
@@ -119,7 +121,9 @@ private:
GVariant * args;
error = nullptr;
- args = g_dbus_connection_call_finish (G_DBUS_CONNECTION(connection), res, &error);
+ args = g_dbus_connection_call_finish (G_DBUS_CONNECTION(connection),
+ res,
+ &error);
if (error != nullptr)
{
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
@@ -150,7 +154,9 @@ private:
GVariant * args;
error = nullptr;
- args = g_dbus_connection_call_finish (G_DBUS_CONNECTION(connection), res, &error);
+ args = g_dbus_connection_call_finish (G_DBUS_CONNECTION(connection),
+ res,
+ &error);
if (error != nullptr)
{
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
@@ -233,7 +239,7 @@ private:
***/
Awake::Awake(const std::string& app_name):
- impl(new Impl (app_name))
+ impl(new Impl (app_name))
{
}
diff --git a/src/notifications.cpp b/src/notifications.cpp
index 6d993df..bad4b1a 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -168,10 +168,11 @@ public:
void close (int key)
{
- // if we've got this one...
auto it = m_notifications.find(key);
if (it != m_notifications.end())
{
+ // tell the server to close, call the close() callback,
+ // and immediately forget about the nn.
GError * error = nullptr;
if (!notify_notification_close (it->second.nn.get(), &error))
{
@@ -187,9 +188,9 @@ public:
int ret = -1;
const auto& info = *builder.impl;
- auto * nn = notify_notification_new (info.m_title.c_str(),
- info.m_body.c_str(),
- info.m_icon_name.c_str());
+ auto nn = notify_notification_new (info.m_title.c_str(),
+ info.m_body.c_str(),
+ info.m_icon_name.c_str());
if (info.m_duration.count() != 0)
{
@@ -243,7 +244,9 @@ public:
}
else
{
- g_critical ("Unable to show notification for '%s': %s", info.m_title.c_str(), error->message);
+ g_critical ("Unable to show notification for '%s': %s",
+ info.m_title.c_str(),
+ error->message);
g_error_free (error);
g_object_unref (nn);
}
@@ -266,8 +269,8 @@ private:
static void on_notification_closed (NotifyNotification * nn, gpointer gself)
{
const GQuark q = notification_key_quark();
- const int key = GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(nn), q));
- static_cast<Impl*>(gself)->on_closed (key);
+ const gpointer gkey = g_object_get_qdata(G_OBJECT(nn), q);
+ static_cast<Impl*>(gself)->on_closed(GPOINTER_TO_INT(gkey));
}
void on_closed (int key)
@@ -281,8 +284,8 @@ private:
{
std::string action;
- const auto q = notification_action_quark();
- const auto p = g_object_get_qdata (G_OBJECT(nn), q);
+ const GQuark q = notification_action_quark();
+ const gpointer p = g_object_get_qdata(G_OBJECT(nn), q);
if (p != nullptr)
action = static_cast<const char*>(p);
@@ -298,7 +301,11 @@ private:
***/
const std::string m_app_name;
+
+ // key-to-data
std::map<int,notification_data> m_notifications;
+
+ // server capabilities
std::set<std::string> m_caps;
static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
@@ -320,7 +327,7 @@ Engine::~Engine()
bool
Engine::supports_actions() const
{
- return impl->supports_actions();
+ return true;//impl->supports_actions();
}
int
diff --git a/src/snap.cpp b/src/snap.cpp
index d99e5ef..e9df256 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -39,8 +39,11 @@ namespace datetime {
****
***/
-static std::string get_alarm_uri(const Appointment& appointment,
- const std::shared_ptr<const Settings>& settings)
+namespace // unnamed namespace
+{
+
+std::string get_alarm_uri(const Appointment& appointment,
+ const std::shared_ptr<const Settings>& settings)
{
const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"};
@@ -72,6 +75,8 @@ static std::string get_alarm_uri(const Appointment& appointment,
return uri;
}
+} // unnamed namespace
+
/***
****
***/
@@ -102,7 +107,7 @@ void Snap::operator()(const Appointment& appointment,
// force the system to stay awake
auto awake = std::make_shared<uin::Awake>(m_engine->app_name());
- // create the sound...,
+ // create the sound...
const auto uri = get_alarm_uri(appointment, m_settings);
const auto volume = m_settings->alarm_volume.get();
const bool loop = m_engine->supports_actions();
diff --git a/src/sound.cpp b/src/sound.cpp
index 052b168..7658658 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -63,13 +63,14 @@ public:
gst_object_unref(bus);
g_debug("Playing '%s'", m_uri.c_str());
- play();
+ g_object_set(G_OBJECT (m_play), "uri", m_uri.c_str(),
+ "volume", get_volume(),
+ nullptr);
+ gst_element_set_state (m_play, GST_STATE_PLAYING);
}
~Impl()
{
- stop();
-
g_source_remove(m_watch_source);
if (m_play != nullptr)
@@ -81,24 +82,6 @@ public:
private:
- void stop()
- {
- if (m_play != nullptr)
- {
- gst_element_set_state (m_play, GST_STATE_PAUSED);
- }
- }
-
- void play()
- {
- g_return_if_fail(m_play != nullptr);
-
- g_object_set(G_OBJECT (m_play), "uri", m_uri.c_str(),
- "volume", get_volume(),
- nullptr);
- gst_element_set_state (m_play, GST_STATE_PLAYING);
- }
-
// convert settings range [1..100] to gst playbin's range is [0...1.0]
gdouble get_volume() const
{