marlin r1335 - trunk/marlin

[iain svn gnome org]

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

Log:
Conflicts:

	marlin/marlin-jack-play.c


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

Modified: trunk/marlin/marlin-jack-play.c
==============================================================================
--- trunk/marlin/marlin-jack-play.c	(original)
+++ trunk/marlin/marlin-jack-play.c	Tue Nov  4 01:27:12 2008
@@ -473,11 +473,8 @@
 			continue;
 		}
 
-<<<<<<< HEAD:marlin/marlin-jack-play.c
-=======
 		/* Left and right do not always require the
 		   same number of frames */
->>>>>>> work:marlin/marlin-jack-play.c
 		gen_frames[i] = src_callback_read (pd->state, priv->src_ratio,
 						   frames_needed,
 						   pd->rb_buffer);
@@ -541,6 +538,7 @@
 	priv = GET_PRIVATE (jack);
 
 	if (priv->sample == NULL) {
+		
 		g_warning ("No sample to play");
 		return FALSE;
 	}