1
=== modified file 'src/CMakeLists.txt'
2
--- src/CMakeLists.txt	2017-03-24 18:01:58 +0000
3
+++ src/CMakeLists.txt	2017-03-24 18:01:58 +0000
4
@@ -235,7 +235,7 @@
5
235
235
6
236
add_executable(
236
add_executable(
7
237
  indicator-sound-service-bin
237
  indicator-sound-service-bin
9
238
  main.c
238
  main.cpp
10
239
)
239
)
11
240
240
12
241
set_target_properties(
241
set_target_properties(
13
242
242
14
=== renamed file 'src/main.c' => 'src/main.cpp'
15
--- src/main.c	2017-03-24 18:01:58 +0000
16
+++ src/main.cpp	2017-03-24 18:01:58 +0000
17
@@ -1,5 +1,5 @@
18
1
/*
1
/*
20
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2017 Canonical Ltd.
21
3
 *
3
 *
22
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
23
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
24
@@ -14,23 +14,23 @@
25
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
26
15
 */
15
 */
27
16
16
28
17
#include "indicator-sound-service.h"
29
18
#include "config.h"
30
19
31
17
#include <glib.h>
20
#include <glib.h>
32
21
#include <glib-unix.h>
33
22
#include <libintl.h>
34
18
#include <locale.h>
23
#include <locale.h>
35
19
#include <libnotify/notify.h>
24
#include <libnotify/notify.h>
36
20
25
50
21
#include "indicator-sound-service.h"
26
#include <memory>
51
22
#include "config.h"
27
#include <unity/util/GObjectMemory.h>
52
23
28
#include <unity/util/GlibMemory.h>
53
24
static IndicatorSoundService * service = NULL;
29
54
25
static pa_glib_mainloop * pgloop = NULL;
30
using namespace unity::util;
55
26
31
56
27
static gboolean
32
static std::shared_ptr<IndicatorSoundService> service;
57
28
sigterm_handler (gpointer data)
33
static std::shared_ptr<pa_glib_mainloop> pgloop;
45
29
{
46
30
    g_debug("Got SIGTERM");
47
31
    g_main_loop_quit((GMainLoop *)data);
48
32
    return G_SOURCE_REMOVE;
49
33
}
58
34
34
59
35
static void
35
static void
60
36
on_name_lost(GDBusConnection * connection,
36
on_name_lost(GDBusConnection * connection,
61
@@ -46,61 +46,57 @@
62
46
                const gchar *name,
46
                const gchar *name,
63
47
                gpointer user_data)
47
                gpointer user_data)
64
48
{
48
{
89
49
    MediaPlayerList * playerlist = NULL;
49
    pgloop = share_gobject(pa_glib_mainloop_new(nullptr));
90
50
    IndicatorSoundOptions * options = NULL;
50
91
51
    VolumeControlPulse * volume = NULL;
51
    auto playerlist = unique_gobject(media_player_list_mpris_new());
92
52
    AccountsServiceUser * accounts = NULL;
52
    auto accounts = unique_gobject(accounts_service_user_new());
93
53
    VolumeWarning * warning = NULL;
53
    auto options = unique_gobject(indicator_sound_options_gsettings_new());
94
54
    AccountsServiceAccess * accounts_service_access = NULL;
54
    auto accounts_service_access = unique_gobject(accounts_service_access_new());
95
55
55
    auto volume = unique_gobject(volume_control_pulse_new(INDICATOR_SOUND_OPTIONS(options.get()),
96
56
56
                                                          pgloop.get(),
97
57
    playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new());
57
                                                          accounts_service_access.get()));
98
58
    accounts = accounts_service_user_new();
58
    auto warning = unique_gobject(volume_warning_pulse_new(INDICATOR_SOUND_OPTIONS(options.get()),
99
59
59
                                                           pgloop.get()));
100
60
    pgloop = pa_glib_mainloop_new(NULL);
60
101
61
    options = indicator_sound_options_gsettings_new();
61
    service = share_gobject(indicator_sound_service_new(MEDIA_PLAYER_LIST(playerlist.get()),
102
62
    accounts_service_access = accounts_service_access_new();
62
                                                        VOLUME_CONTROL(volume.get()),
103
63
    volume = volume_control_pulse_new(options, pgloop, accounts_service_access);
63
                                                        accounts.get(),
104
64
    warning = volume_warning_pulse_new(options, pgloop);
64
                                                        INDICATOR_SOUND_OPTIONS(options.get()),
105
65
65
                                                        VOLUME_WARNING(warning.get()),
106
66
    service = indicator_sound_service_new (playerlist, volume, accounts, options, warning, accounts_service_access);
66
                                                        accounts_service_access.get()));
83
67
84
68
    g_clear_object(&playerlist);
85
69
    g_clear_object(&options);
86
70
    g_clear_object(&volume);
87
71
    g_clear_object(&accounts);
88
72
    g_clear_object(&warning);
107
73
}
67
}
108
74
68
109
75
int
69
int
110
76
main (int argc, char ** argv)
70
main (int argc, char ** argv)
111
77
{
71
{
112
78
    GMainLoop * loop = NULL;
113
79
    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
72
    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
114
80
    setlocale (LC_ALL, "");
73
    setlocale (LC_ALL, "");
115
81
    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
74
    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
116
82
75
117
83
    /* Build Mainloop */
76
    /* Build Mainloop */
119
84
    loop = g_main_loop_new(NULL, FALSE);
77
    auto loop = unique_glib(g_main_loop_new(nullptr, false));
120
85
78
122
86
    g_unix_signal_add(SIGTERM, sigterm_handler, loop);
79
    g_unix_signal_add(SIGTERM,
123
80
                      [](gpointer data) {
124
81
                          g_main_loop_quit(static_cast<GMainLoop*>(data));
125
82
                          return G_SOURCE_REMOVE;
126
83
                      },
127
84
                      loop.get());
128
87
85
129
88
    /* Initialize libnotify */
86
    /* Initialize libnotify */
130
89
    notify_init ("indicator-sound");
87
    notify_init ("indicator-sound");
131
90
88
132
89
    // TODO: Move bus ownership out of main() once vala is gone
133
91
    g_bus_own_name(G_BUS_TYPE_SESSION,
90
    g_bus_own_name(G_BUS_TYPE_SESSION,
134
92
        "com.canonical.indicator.sound",
91
        "com.canonical.indicator.sound",
135
93
        G_BUS_NAME_OWNER_FLAGS_NONE,
92
        G_BUS_NAME_OWNER_FLAGS_NONE,
136
94
        on_bus_acquired,
93
        on_bus_acquired,
138
95
        NULL, /* name acquired */
94
        nullptr, /* name acquired */
139
96
        on_name_lost,
95
        on_name_lost,
147
97
        loop,
96
        loop.get(),
148
98
        NULL);
97
        nullptr);
149
99
98
150
100
    g_main_loop_run(loop);
99
    g_main_loop_run(loop.get());
144
101
145
102
    g_clear_object(&service);
146
103
    g_clear_pointer(&pgloop, pa_glib_mainloop_free);
151
104
100
152
105
    notify_uninit();
101
    notify_uninit();
153
106
102
Status:	Approved
Approved by:	dobey on 2017-03-29
Approved revision:	554
Proposed branch:	lp:~dobey/indicator-sound/initial-cpp
Merge into:	lp:indicator-sound
Prerequisite:	lp:~dobey/indicator-sound/drop-greeeter
Diff against target:	152 lines (+46/-50) 2 files modified src/CMakeLists.txt (+1/-1) src/main.cpp (+45/-49)
To merge this branch:	bzr merge lp:~dobey/indicator-sound/initial-cpp
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2017-03-30
Charles Kerr (community)		2017-03-24	Approve on 2017-03-24
Review via email: mp+320974@code.launchpad.net