marlin r1337 - trunk/marlin

[iain svn gnome org]

Author: iain
Date: Tue Nov  4 12:32:53 2008
New Revision: 1337
URL: http://svn.gnome.org/viewvc/marlin?rev=1337&view=rev

Log:
Squashed commit of the following:

commit cbecb757638f8c088fba2bab16a91ee73905a432
Author: iain <iain gnome org>
Date:   Tue Nov 4 12:26:08 2008 +0000

    Fix build

commit a9f90f95e0a4395094bda16b62bf77a61e84afb3
Author: iain <iain gnome org>
Date:   Tue Nov 4 12:14:53 2008 +0000

    Add comments and GErrors

commit 03b3b38bcee63379f4fd23894fd517d1c7076ce8
Author: iain <iain gnome org>
Date:   Tue Nov 4 01:32:57 2008 +0000

    Generate Errors, add comments

commit 2e0db60719872640efde748b758d002f5da33b46
Author: iain <iain gnome org>
Date:   Tue Nov 4 01:25:16 2008 +0000

    Remove conflict

commit 32e77b41b370b205bce02a608f3261f1ff129fa8
Author: iain <iain gnome org>
Date:   Tue Nov 4 01:13:52 2008 +0000

    Fix compile
    Add comments, make ohloh happier.

commit e418195f8272636567e9fbf9ca0512a277ac2f1d
Author: iain <iain gnome org>
Date:   Tue Nov 4 00:57:19 2008 +0000

    Fix buffer overrun causing crash when right channel generates more
    frames than the left.

commit 2b633968f22d7be919330656f47a141ea737257c
Author: iain <iain gnome org>
Date:   Sun Nov 2 00:58:57 2008 +0000

    Check for jackd

commit d96f9ca802c8508440ed5a611f0c42eca1e33278
Author: iain <iain gnome org>
Date:   Sun Nov 2 00:39:04 2008 +0000

    Turn off the Process menu whenever the sample is playing.
    Stop sample playing whenever the window is closed

commit 647984e8cad2cb3d6885609fff53521ac1a345ed
Author: iain <iain gnome org>
Date:   Sat Nov 1 02:01:40 2008 +0000

    Only need one progress window in the struct...save 4bytes every
    window!!!!

commit 4603444f3c9aad0ac8b47c8edb22e823231670eb
Author: iain <iain gnome org>
Date:   Sat Nov 1 01:55:36 2008 +0000

    Take name of new sample from the beginning marker, rather than the end


Modified:
   trunk/marlin/marlin-jack-record.c

Modified: trunk/marlin/marlin-jack-record.c
==============================================================================
--- trunk/marlin/marlin-jack-record.c	(original)
+++ trunk/marlin/marlin-jack-record.c	Tue Nov  4 12:32:53 2008
@@ -87,6 +87,7 @@
 	guint channels;
 
 	guint rate, jrate;
+	double src_ratio;
 
 	struct _port_data **port_data;
 
@@ -185,6 +186,7 @@
 		GParamSpec       *pspec,
 		MarlinJackRecord *jack)
 {
+#if 0
 	MarlinJackRecordPrivate *priv = jack->priv;
 
 	if (strcmp (pspec->name, "sample_rate") == 0) {
@@ -204,6 +206,7 @@
 		setup_ports (jack);
 		return;
 	}
+#endif
 }
 
 static void