Revert "Refactor API to allow seperate preview and record steps"

This reverts commit f2a6d84.
mozilla · Mar 28, 2011 · 6b268e8 · 6b268e8
1 parent f2a6d84
commit 6b268e8
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 282 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7  21,7 @@ endif
 endif
 
 so_files=components/libmediarecorder.$(so)
-xpt_files=components/IMediaDevice.xpt
 xpt_files=components/IMediaRecorder.xpt
 
 xpi_name=rainbow-$(VERSION)-dev.xpi
 xpi_files=chrome.manifest install.rdf content/ $(so_files) $(xpt_files)

diff --git a/chrome.manifest b/chrome.manifest
@@ -2,7  2,7 @@ resource rainbow ./
 content rainbow content/
 overlay chrome://browser/content/browser.xul chrome://rainbow/content/browser.xul
 
-interfaces components/IMediaDevice.xpt
 interfaces components/IMediaRecorder.xpt
 binary-component components/libmediarecorder.dylib ABI=Darwin_x86-gcc3
 binary-component components/libmediarecorder.dll ABI=WINNT_x86-msvc
 binary-component components/libmediarecorder.so ABI=Linux_x86-gcc3

diff --git a/components/IMediaDevice.idl → components/IMediaRecorder.idl b/components/IMediaDevice.idl → components/IMediaRecorder.idl
@@ -46,14  46,10 @@ interface nsIMediaStateObserver : nsISupports
 };
 
 [scriptable, uuid(c467b1f4-551c-4e2f-a6ba-cb7d792d1452)]
-interface IMediaDevice : nsISupports
 interface IMediaRecorder : nsISupports
 {
-    void beginSession(in nsIPropertyBag2 prop,
     void recordToFile(in nsIPropertyBag2 prop,
         in nsIDOMCanvasRenderingContext2D ctx,
-        in nsIMediaStateObserver obs);
-    void beginRecord(in nsILocalFile file);
-    void pauseRecord();
-    void resumeRecord();
-    void endRecord();
-    void endSession();
         in nsILocalFile file, in nsIMediaStateObserver obs);
     void stop();
 };
diff --git a/components/Makefile b/components/Makefile
@@ -53,7  53,7 @@ target = libmediarecorder
 so_target = $(target:=.$(so))
 
 # source and path configurations
-idl = IMediaDevice.idl
 idl = IMediaRecorder.idl
 cpp_sources = MediaRecorder.cpp MediaModule.cpp Convert.cpp \
     VideoSource.cpp $(os)/VideoSource$(teh).cpp \
     AudioSource.cpp $(os)/AudioSource$(teh).cpp \