spek

commit 2a679d6d9ddb8dc6a395162cf14840b2138d4dc2
parent e86cd8b11192ea99ee0c2fdcf877a2b009ec84eb
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Wed, 28 Apr 2010 21:27:52 +1000

Add GStreamer dependency

Diffstat:
M
configure.ac
 | 
4
++--
M
src/spek-window.vala
 | 
4
++--
M
src/spek.vala
 | 
6
++----
M
vapi/config.vapi
 | 
7
+++----

4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -17,8 +17,8 @@ AM_PROG_VALAC([0.7.0])
 AC_PROG_INSTALL
 AC_PROG_INTLTOOL([0.35])
 
-pkg_modules="gtk+-2.0 >= 2.14.0"
-SPEK_PACKAGES="--pkg gtk+-2.0"
+pkg_modules="gtk+-2.0 >= 2.14.0 gstreamer-0.10 >= 0.10.17"
+SPEK_PACKAGES="--pkg gtk+-2.0 --pkg gstreamer-0.10"
 PKG_CHECK_MODULES(SPEK, [$pkg_modules])
 AC_SUBST(SPEK_CFLAGS)
 AC_SUBST(SPEK_LIBS)
diff --git a/src/spek-window.vala b/src/spek-window.vala
@@ -4,8 +4,9 @@ namespace Spek {
 	public class Window : Gtk.Window {
 
 		public Window () {
-			this.title = "Spek";
+			this.title = Config.PACKAGE_STRING;
 			this.set_default_size (300, 200);
+			this.destroy.connect (Gtk.main_quit);
 
 			var toolbar = new Toolbar ();
 			var open = new ToolButton.from_stock (STOCK_OPEN);
@@ -29,7 +30,6 @@ namespace Spek {
 			if (chooser.run () == ResponseType.ACCEPT) {
 				// TODO
 			}
-			chooser.destroy ();
 		}
 	}
 }
 \ No newline at end of file
diff --git a/src/spek.vala b/src/spek.vala
@@ -6,10 +6,8 @@ int main (string[] args) {
 	Intl.textdomain (Config.GETTEXT_PACKAGE);
 
 	Gtk.init (ref args);
-
-	var window = new Spek.Window ();
-	window.destroy.connect (Gtk.main_quit);
-
+	Gst.init (ref args);
+	new Spek.Window ();
 	Gtk.main ();
 	return 0;
 }
diff --git a/vapi/config.vapi b/vapi/config.vapi
@@ -1,6 +1,5 @@
 [CCode (prefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
-namespace Config
-{
+namespace Config {
 	/* Package information */
 	public const string PACKAGE_NAME;
 	public const string PACKAGE_STRING;
@@ -12,6 +11,6 @@ namespace Config
 	/* Configured paths - these variables are not present in config.h, they are
 	 * passed to underlying C code as cmd line macros. */
 	public const string LOCALEDIR;  /* /usr/local/share/locale  */
-	public const string PKGDATADIR; /* /usr/local/share/sampala */
-	public const string PKGLIBDIR;  /* /usr/local/lib/sampala   */
+	public const string PKGDATADIR; /* /usr/local/share/spek */
+	public const string PKGLIBDIR;  /* /usr/local/lib/spek   */
 }