Author: rolf
Date: 2008-01-19 06:11:45 -0500 (Sat, 19 Jan 2008)
New Revision: 93312
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/Makefile.am
trunk/moon/src/media.cpp
trunk/moon/src/mplayer.cpp
trunk/moon/src/mplayer2.cpp
trunk/moon/src/pipeline.h
trunk/moon/src/src.mdp
Log:
* media.cpp, mplayer.cpp, mplayer2.cpp, Makefile.am, pipeline.h: Remove
all MOON_MEDIA ifdefs and completely disable the old mplayer.cpp
* src.mdp: Updated.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/ChangeLog 2008-01-19 11:11:45 UTC (rev 93312)
@@ -1,5 +1,11 @@
2008-01-19 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ * media.cpp, mplayer.cpp, mplayer2.cpp, Makefile.am, pipeline.h: Remove
all
+ MOON_MEDIA ifdefs and completely disable the old mplayer.cpp
+ * src.mdp: Updated.
+
+2008-01-19 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
* media.h, media.cpp: MediaElement: make this a state machine to follow
the
behaviour specified in MSDN. Implement buffering of media files.
MediaSource (and derived): take a IMediaSource instead of a filename.
Modified: trunk/moon/src/Makefile.am
===================================================================
--- trunk/moon/src/Makefile.am 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/Makefile.am 2008-01-19 11:11:45 UTC (rev 93312)
@@ -1,3 +1,5 @@
+AAACFLAGS = -O0 -g
+CXXFLAGS = -O0 -g
libmoonincludedir=$(includedir)/libmoon
@@ -91,7 +93,6 @@
mango.cpp \
media.cpp \
moon-path.c \
- mplayer.cpp \
mplayer2.cpp \
namescope.cpp \
openfile.cpp \
Modified: trunk/moon/src/media.cpp
===================================================================
--- trunk/moon/src/media.cpp 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/media.cpp 2008-01-19 11:11:45 UTC (rev 93312)
@@ -273,7 +273,6 @@
}
}
-#ifdef MOON_MEDIA
static MediaResult marker_callback (MediaClosure* closure)
{
MediaElement* element = (MediaElement*) closure->context;
@@ -293,7 +292,6 @@
return MEDIA_SUCCESS;
}
-#endif
void
MediaElement::AddStreamedMarker (TimelineMarker* marker)
@@ -306,7 +304,6 @@
void
MediaElement::ReadMarkers ()
{
-#ifdef MOON_MEDIA
//printf ("MediaElement::ReadMarkers ()\n");
IMediaDemuxer* demuxer;
@@ -356,7 +353,6 @@
//printf ("MediaElement::ReadMarkers (): setting %i markers.\n",
collection_count (col));
SetValue (MarkersProperty, col);
col->unref ();
-#endif
}
void
@@ -1948,7 +1944,5 @@
t = Type::Find (Type::IMAGE);
Image::ImageFailedEvent = t->LookupEvent ("ImageFailed");
-#ifdef MOON_MEDIA
Media::Initialize ();
-#endif
}
Modified: trunk/moon/src/mplayer.cpp
===================================================================
--- trunk/moon/src/mplayer.cpp 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/mplayer.cpp 2008-01-19 11:11:45 UTC (rev 93312)
@@ -8,12 +8,13 @@
* See the LICENSE file included with the distribution for details.
*/
+#if 0
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "pipeline.h"
-#ifndef MOON_MEDIA
#include <glib.h>
@@ -1334,4 +1335,4 @@
return NULL;
}
-#endif // MOON_MEDIA
+#endif // #if 0
Modified: trunk/moon/src/mplayer2.cpp
===================================================================
--- trunk/moon/src/mplayer2.cpp 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/mplayer2.cpp 2008-01-19 11:11:45 UTC (rev 93312)
@@ -38,8 +38,6 @@
#include "runtime.h"
#include "list.h"
-#ifdef MOON_MEDIA
-
#if GLIB_SIZEOF_VOID_P == 8
#define ALIGN(addr,size) (uint8_t *) (((uint64_t) (((uint8_t *) (addr)) +
(size) - 1)) & ~((size) - 1))
#else
@@ -1204,4 +1202,3 @@
return NULL;
}
-#endif // MOON_MEDIA
Modified: trunk/moon/src/pipeline.h
===================================================================
--- trunk/moon/src/pipeline.h 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/pipeline.h 2008-01-19 11:11:45 UTC (rev 93312)
@@ -10,8 +10,6 @@
*
*/
-#define MOON_MEDIA
-
#ifndef __MOON_PIPELINE_H_
#define __MOON_PIPELINE_H_
Modified: trunk/moon/src/src.mdp
===================================================================
--- trunk/moon/src/src.mdp 2008-01-19 11:06:14 UTC (rev 93311)
+++ trunk/moon/src/src.mdp 2008-01-19 11:11:45 UTC (rev 93312)
@@ -42,8 +42,6 @@
<File name="downloader.h" subtype="Code" buildaction="Nothing" />
<File name="enums.h" subtype="Code" buildaction="Nothing" />
<File name="error.h" subtype="Code" buildaction="Nothing" />
- <File name="ffstream.cpp" subtype="Code" buildaction="Compile" />
- <File name="ffstream.h" subtype="Code" buildaction="Nothing" />
<File name="font.cpp" subtype="Code" buildaction="Compile" />
<File name="font.h" subtype="Code" buildaction="Nothing" />
<File name="frameworkelement.cpp" subtype="Code" buildaction="Compile" />
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
