Author: jbevain
Date: 2007-10-02 08:33:10 -0400 (Tue, 02 Oct 2007)
New Revision: 86740
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/media.cpp
trunk/moon/src/media.h
trunk/moon/src/playlist.cpp
trunk/moon/src/playlist.h
Log:
2007-10-02 Jb Evain <[EMAIL PROTECTED]>
* playlist.cpp|h, media.cpp|h: rename MediaSource::OpenSource to
OpenInternal.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-10-02 11:49:16 UTC (rev 86739)
+++ trunk/moon/src/ChangeLog 2007-10-02 12:33:10 UTC (rev 86740)
@@ -1,3 +1,7 @@
+2007-10-02 Jb Evain <[EMAIL PROTECTED]>
+
+ * playlist.cpp|h, media.cpp|h: rename MediaSource::OpenSource to
OpenInternal.
+
2007-10-02 Larry Ewing <[EMAIL PROTECTED]>
* uielement.cpp (UIElement::Invalidate): Only invalidate if
Modified: trunk/moon/src/media.cpp
===================================================================
--- trunk/moon/src/media.cpp 2007-10-02 11:49:16 UTC (rev 86739)
+++ trunk/moon/src/media.cpp 2007-10-02 12:33:10 UTC (rev 86740)
@@ -109,7 +109,7 @@
bool
MediaSource::Open ()
{
- if (!OpenSource ()) {
+ if (!OpenInternal ()) {
media_element_set_can_seek (element, false);
media_element_set_can_pause (element, false);
media_element_set_audio_stream_count (element, 0);
@@ -156,7 +156,7 @@
}
bool
-SingleMedia::OpenSource ()
+SingleMedia::OpenInternal ()
{
return element->mplayer->Open (file_name);
}
Modified: trunk/moon/src/media.h
===================================================================
--- trunk/moon/src/media.h 2007-10-02 11:49:16 UTC (rev 86739)
+++ trunk/moon/src/media.h 2007-10-02 12:33:10 UTC (rev 86740)
@@ -132,7 +132,7 @@
MediaPlayer *GetMediaPlayer ();
- virtual bool OpenSource () = 0;
+ virtual bool OpenInternal () = 0;
public:
virtual ~MediaSource ();
@@ -155,7 +155,7 @@
void ClearTimeout ();
protected:
- virtual bool OpenSource ();
+ virtual bool OpenInternal ();
public:
SingleMedia (MediaElement *element, const char *source_name, const char
*file_name);
virtual ~SingleMedia ();
Modified: trunk/moon/src/playlist.cpp
===================================================================
--- trunk/moon/src/playlist.cpp 2007-10-02 11:49:16 UTC (rev 86739)
+++ trunk/moon/src/playlist.cpp 2007-10-02 12:33:10 UTC (rev 86740)
@@ -189,7 +189,7 @@
}
bool
-Playlist::OpenSource ()
+Playlist::OpenInternal ()
{
if (!Parse ())
return false;
Modified: trunk/moon/src/playlist.h
===================================================================
--- trunk/moon/src/playlist.h 2007-10-02 11:49:16 UTC (rev 86739)
+++ trunk/moon/src/playlist.h 2007-10-02 12:33:10 UTC (rev 86740)
@@ -173,7 +173,7 @@
static void on_downloader_data_write (guchar *buf, gsize offset, gsize
count, gpointer data);
static void on_downloader_size_notify (int64_t size, gpointer data);
protected:
- virtual bool OpenSource ();
+ virtual bool OpenInternal ();
public:
Playlist (MediaElement *element, const char *source_name, const char
*file_name);
virtual ~Playlist ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
