Merge lp:~bfiller/phone-app/fix-ringtone into lp:phone-app

[Bill Filler]

fix singleton

fix singleton

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/phone-app-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/107

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/134/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

As self is being declared static, it will only be initialized once in the original code. The change itself is not wrong, it can be implemented that way too, but the result is the same and in my personal opinion the original code is more simple as it is contained all in the function code.

review: Disapprove

Unmerged revisions

663. By Bill Filler on 2013-06-03

don't new up instance of Ringtone each time, check if null and only new if needed

=== modified file 'libphoneapp/ringtone.cpp'
--- libphoneapp/ringtone.cpp	2013-03-11 22:22:35 +0000
+++ libphoneapp/ringtone.cpp	2013-06-03 20:14:25 +0000
@@ -23,6 +23,8 @@
 #include <QDebug>
 
 #define SOUND_PATH "/usr/share/sounds/ubuntu/stereo/"
+static Ringtone *self = NULL;
+
 Ringtone::Ringtone(QObject *parent) :
     QObject(parent),
     mCallAudioPlayer(this), mCallAudioPlaylist(this), mMessageAudioPlayer(this)
@@ -35,8 +37,9 @@
 
 Ringtone *Ringtone::instance()
 {
-    static Ringtone *self = new Ringtone();
-    return self;
+  if (self == NULL)
+    self = new Ringtone();
+  return self;
 }
 
 void Ringtone::playIncomingCallSound()