[gst-cvs] dlehn gst-plugins: gst-plugins/ gst-plugins/ext/ gst-plugins/ext/alsa/

[David I. L. <dl...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     dlehn
Date:           Fri Jul 05 2002  01:17:54 PDT
Branch:         BRANCH-RELEASE-0_4_0

Log message:
last second merge from HEAD

Modified files:
    .               : Makefile.am
    ext             : Makefile.am
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/Makefile.am.diff?r1=1.24&r2=1.24.2.1
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/Makefile.am.diff?r1=1.49&r2=1.49.2.1
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.14.2.1&r2=1.14.2.2

====Begin Diffs====
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- Makefile.am	1 Jul 2002 15:41:13 -0000	1.24
+++ Makefile.am	5 Jul 2002 08:17:12 -0000	1.24.2.1
@@ -14,4 +14,10 @@
 
 DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
 
-EXTRA_DIST=gst-plugins.spec depcomp AUTHORS COPYING README RELEASE ChangeLog autogen.sh
+EXTRA_DIST=gst-plugins.spec depcomp \
+	AUTHORS COPYING README RELEASE LICENSE LICENSE_readme \
+	ChangeLog autogen.sh common m4
+
+dist-hook:
+	rm -rf `find $(distdir)/common -name CVS`
+	rm -rf `find $(distdir)/m4 -name CVS`
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.49.2.1
diff -u -d -r1.49 -r1.49.2.1
--- Makefile.am	4 Jun 2002 15:54:58 -0000	1.49
+++ Makefile.am	5 Jul 2002 08:17:12 -0000	1.49.2.1
@@ -230,7 +230,7 @@
         $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
 	$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
 	$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
-	$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
+	$(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
 	$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
 	$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \
 	$(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
@@ -242,7 +242,7 @@
 	a52dec aalib alsa \
 	arts artsd avifile \
 	audiofile cdparanoia dv \
-	dvdread dvdnav esd ffmpeg \
+	dvdread dvdnav esd festival ffmpeg \
 	flac gnomevfs gsm \
 	hermes http jack jpeg \
 	ladspa lame lcs libfame \
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- gstalsa.c	2 Jul 2002 08:08:42 -0000	1.14.2.1
+++ gstalsa.c	5 Jul 2002 08:17:12 -0000	1.14.2.2
@@ -944,7 +944,8 @@
             pad->offset += MIN(frames, this->period_frames - pad->offset);
             
             if (pad->offset >= this->period_frames) {
-	        g_assert(pad->offset <= this->period_frames);  
+                g_assert(pad->offset <= this->period_frames);
+
                 buf = gst_buffer_new();
                 GST_BUFFER_DATA(buf)    = pad->buf;
                 GST_BUFFER_SIZE(buf)    = this->period_frames * unit;