Refactoring

	modified:   ../build.sh
	modified:   AboutDialog.vala
	modified:   EqualizerPreset.vala

diff --git a/build.sh b/build.sh
index dd45d50..82be214 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -46,6 +46,7 @@ src/TrackBin.vala \
 src/TrackEffectsPopUp.vala \
 src/TrackPipeline.vala \
 src/TrackTransport.vala \
 src/TrackEffectsPopUp.vala \
 src/TrackPipeline.vala \
 src/TrackTransport.vala \

+src/Utilities.vala \

 src/VolumeAndPanPopUp.vala \
 src/XmlHelpers.vala \
 src/YesNoCancelDialog.vala
 src/VolumeAndPanPopUp.vala \
 src/XmlHelpers.vala \
 src/YesNoCancelDialog.vala

diff --git a/src/AboutDialog.vala b/src/AboutDialog.vala
index 0721e43..a134f6b 100644 (file)
--- a/src/AboutDialog.vala
+++ b/src/AboutDialog.vala
@@ -39,10 +39,10 @@ public class AboutDialog : Hildon.Dialog {
     
     Hildon.Button site_link = new Hildon.Button(Hildon.SizeType.FINGER_HEIGHT | Hildon.SizeType.AUTO_WIDTH, Hildon.ButtonArrangement.HORIZONTAL);
     site_link.set_text("Project Homepage", "");
     
     Hildon.Button site_link = new Hildon.Button(Hildon.SizeType.FINGER_HEIGHT | Hildon.SizeType.AUTO_WIDTH, Hildon.ButtonArrangement.HORIZONTAL);
     site_link.set_text("Project Homepage", "");

-    site_link.clicked.connect((e) => {open_url("http://demorecorder.garage.maemo.org/");});
+    site_link.clicked.connect((c) => {Utilities.open_url("http://demorecorder.garage.maemo.org/");});

     Hildon.Button bug_link = new Hildon.Button(Hildon.SizeType.FINGER_HEIGHT | Hildon.SizeType.AUTO_WIDTH, Hildon.ButtonArrangement.HORIZONTAL);
     bug_link.set_text("Report a Bug", "");
     Hildon.Button bug_link = new Hildon.Button(Hildon.SizeType.FINGER_HEIGHT | Hildon.SizeType.AUTO_WIDTH, Hildon.ButtonArrangement.HORIZONTAL);
     bug_link.set_text("Report a Bug", "");

-    bug_link.clicked.connect((e) => {open_url("https://garage.maemo.org/tracker/?group_id=1799");});
+    bug_link.clicked.connect((c) => {Utilities.open_url("https://garage.maemo.org/tracker/?group_id=1799");});

     Gtk.VBox contents = new Gtk.VBox(false, 4);
     contents.pack_start(about_text, true, true, 4);
     Gtk.HBox button_bar = new Gtk.HBox(true, 4);
     Gtk.VBox contents = new Gtk.VBox(false, 4);
     contents.pack_start(about_text, true, true, 4);
     Gtk.HBox button_bar = new Gtk.HBox(true, 4);

@@ -59,22 +59,6 @@ public class AboutDialog : Hildon.Dialog {
     
     this.show_all();
   }
     
     this.show_all();
   }

-  private void open_homepage() {
-    open_url("http://demorecorder.garage.maemo.org/");
-  }
-  private void open_bugtrack() {
-    open_url("https://garage.maemo.org/tracker/?group_id=1799");
-  }
-  private void open_url(string url) {
-    Osso.Context osso_context = new Osso.Context("DemoRecorder", "0.1", false, null);
-    Osso.Rpc ret;
-    osso_context.rpc_run("com.nokia.osso_browser",
-                         "/com/nokia/osso_browser",
-                         "com.nokia.osso_browser",
-                         "open_new_window",
-                         out ret, DBus.RawType.STRING, url);
-    osso_context = null;
-  }

 
 }
 
 
 }
 

diff --git a/src/EqualizerPreset.vala b/src/EqualizerPreset.vala
index 2e2490e..f3a66d1 100644 (file)
--- a/src/EqualizerPreset.vala
+++ b/src/EqualizerPreset.vala
@@ -77,17 +77,17 @@ namespace IdWorks {
               "<band_8 type=\"double\">>%02f</band_8>\n" +
               "<band_9 type=\"double\">>%02f</band_9>\n" +
               "</EqualizerSettings>\n").printf(
               "<band_8 type=\"double\">>%02f</band_8>\n" +
               "<band_9 type=\"double\">>%02f</band_9>\n" +
               "</EqualizerSettings>\n").printf(

-              base.name,
-              base.bands[0],
-              base.bands[1],
-              base.bands[2],
-              base.bands[3],
-              base.bands[4],
-              base.bands[5],
-              base.bands[6],
-              base.bands[7],
-              base.bands[8],
-              base.bands[9]
+              name,
+              bands[0],
+              bands[1],
+              bands[2],
+              bands[3],
+              bands[4],
+              bands[5],
+              bands[6],
+              bands[7],
+              bands[8],
+              bands[9]

             );
     }
     public void from_xml_string(Xml.Node* node) {}
             );
     }
     public void from_xml_string(Xml.Node* node) {}