[xiph-cvs] cvs commit: vorbis-plugins/realplayer/render/make linux-2.0-libc6-i386.mak

[Jack Moffitt]

jack        01/07/08 15:17:50

  Modified:    realplayer/render queue.cpp queue.h
               realplayer/render/make linux-2.0-libc6-i386.mak
  Log:
  Fixed silly bug in the queue class, and updated the makefile.

Revision  Changes    Path
1.2       +7 -7      vorbis-plugins/realplayer/render/queue.cpp

Index: queue.cpp
===================================================================
RCS file: /usr/local/cvsroot/vorbis-plugins/realplayer/render/queue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- queue.cpp	2001/04/13 03:44:36	1.1
+++ queue.cpp	2001/07/08 22:17:46	1.2
@@ -15,6 +15,7 @@
  ********************************************************************/
 
 #include <string.h>
+#include <stdio.h>
 
 #include "queue.h"
 
@@ -23,10 +24,10 @@
         QueueElement *p;
         QueueElement *e = new QueueElement(data);
 
-	if (m_elements == NULL) {
-		m_elements = e;
+	if (m_queue == NULL) {
+		m_queue = e;
         } else {
-		p = m_elements;
+		p = m_queue;
                 while (p->m_next != NULL) p = p->m_next;
                 p->m_next = e;
         }
@@ -36,13 +37,12 @@
 {
         void *data;
 
-	if (m_elements == NULL) return NULL;
+	if (m_queue == NULL) return NULL;
 
-	QueueElement *e = m_elements;
+	QueueElement *e = m_queue;
         data = e->m_data;
+	m_queue = m_queue->m_next;
         delete e;
-
-	m_elements = m_elements->m_next;
 
         return data;
 }

1.2       +1 -1      vorbis-plugins/realplayer/render/queue.h

Index: queue.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-plugins/realplayer/render/queue.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- queue.h	2001/04/13 03:44:36	1.1
+++ queue.h	2001/07/08 22:17:46	1.2
@@ -21,7 +21,7 @@
 {
         friend class Queue;
 
-	public:
+ public:
         QueueElement(void *data) 
         {
                 m_data = data;

1.3       +5 -5      vorbis-plugins/realplayer/render/make/linux-2.0-libc6-i386.mak

Index: linux-2.0-libc6-i386.mak
===================================================================
RCS file: /usr/local/cvsroot/vorbis-plugins/realplayer/render/make/linux-2.0-libc6-i386.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.0-libc6-i386.mak	2001/02/01 21:45:04	1.2
+++ linux-2.0-libc6-i386.mak	2001/07/08 22:17:48	1.3
@@ -34,20 +34,20 @@
 
 SRCS = \
         ../rvorbis.cpp \
-	../fivemque.cpp
+	../queue.cpp
 
 OBJS = $(COMPILED_OBJS) $(SOURCE_OBJS)
 
 COMPILED_OBJS = \
         rel/obj/rvorbis.so \
-	rel/obj/fivemque.so
+	rel/obj/queue.so
 
 SOURCE_OBJS = 
 
 INCLUDES = \
         -I/usr/X11R6/include \
         -I/usr/X11R6/include \
-	-I/home/jack/src/rmasdk_6_0/include \
+	-I/home/jack/rmasdk/include \
         -I.. \
         -I./pub
 
@@ -74,8 +74,8 @@
         if test -d rel/obj; then echo; else mkdir rel/obj; fi
 rel/obj/rvorbis.so : ../rvorbis.cpp
         $(CXX) $(CXXFLAGS) -fPIC -DPIC -o rel/obj/rvorbis.so -c ../rvorbis.cpp
-rel/obj/fivemque.so : ../fivemque.cpp
-	$(CXX) $(CXXFLAGS) -fPIC -DPIC -o rel/obj/fivemque.so -c ../fivemque.cpp
+rel/obj/queue.so : ../queue.cpp
+	$(CXX) $(CXXFLAGS) -fPIC -DPIC -o rel/obj/queue.so -c ../queue.cpp
 copy:
         if test -d ../release; then echo; else mkdir ../release; fi
         cp rel/rvorbis.so ../release/rvorbis.so

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.