commit 602d44a12c14e6ec24ce4821dfb77ebb4ad152b9
author Aric Stewart <aric@codeweavers.com> Mon Oct 11 10:15:35 2010 -0500
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 12 11:44:17 2010 +0200
tree 1162729bcdde017aade4e566ebc0f31183552466
parent a8740a46678fd1b044eae22396eea01f93f39af2

strmbase: Move mediaSeeking to strmbase SourceSeeking.

dlls/quartz/mpegsplit.c

diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index 0cffb19..8321131 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -77,6 +77,11 @@
     struct seek_entry *seektable;
 } MPEGSplitterImpl;
 
+static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface )
+{
+    return (MPEGSplitterImpl *)((char*)iface - FIELD_OFFSET(MPEGSplitterImpl, Parser.sourceSeeking.lpVtbl));
+}
+
 static int MPEGSplitter_head_check(const BYTE *header)
 {
     /* If this is a possible start code, check for a system or video header */
@@ -280,7 +285,7 @@
         }
     }
 
-    if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop)
+    if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.sourceSeeking.llStop)
     {
         unsigned int i;
 
@@ -587,9 +592,9 @@
             TRACE("Parsing took %u ms\n", GetTickCount() - ticks);
             This->duration = duration;
 
-            This->Parser.mediaSeeking.llCurrent = 0;
-            This->Parser.mediaSeeking.llDuration = duration;
-            This->Parser.mediaSeeking.llStop = duration;
+            This->Parser.sourceSeeking.llCurrent = 0;
+            This->Parser.sourceSeeking.llDuration = duration;
+            This->Parser.sourceSeeking.llStop = duration;
             break;
         }
         case MPEG_VIDEO_HEADER:
@@ -618,15 +623,15 @@
     return S_OK;
 }
 
-static HRESULT MPEGSplitter_seek(IBaseFilter *iface)
+static HRESULT WINAPI MPEGSplitter_seek(IMediaSeeking *iface)
 {
-    MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface;
+    MPEGSplitterImpl *This = impl_from_IMediaSeeking(iface);
     PullPin *pPin = This->Parser.pInputPin;
     LONGLONG newpos, timepos, bytepos;
     HRESULT hr = S_OK;
     BYTE header[4];
 
-    newpos = This->Parser.mediaSeeking.llCurrent;
+    newpos = This->Parser.sourceSeeking.llCurrent;
 
     if (newpos > This->duration)
     {