change ERROR: words from throw-foo back to foo.

[factor.git] / extra / audio / vorbis / vorbis.factor

diff --git a/extra/audio/vorbis/vorbis.factor b/extra/audio/vorbis/vorbis.factor
index eae8b48509a7918c07286d787ee82be9b3bce56b..d8036b4ee0fd980fa77e846c76f4a72bf8e1058a 100644 (file)
--- a/extra/audio/vorbis/vorbis.factor
+++ b/extra/audio/vorbis/vorbis.factor
@@ -48,7 +48,7 @@ ERROR: no-vorbis-in-ogg ;
     stream>> read-bytes-into ; inline
 
 : ?ogg-error ( n -- )
-    dup 0 < [ throw-ogg-error ] [ drop ] if ; inline
+    dup 0 < [ ogg-error ] [ drop ] if ; inline
 
 : confirm-buffer ( len vorbis-stream -- ? )
     '[ _ sync-state>> swap ogg_sync_wrote ?ogg-error ] keep zero? not ; inline
@@ -119,11 +119,11 @@ ERROR: no-vorbis-in-ogg ;
     #vorbis-headers>> 1 2 between? not ; inline
 
 : ?vorbis-error ( code -- )
-    [ throw-vorbis-error ] unless-zero ; inline
+    [ vorbis-error ] unless-zero ; inline
 
 : get-remaining-vorbis-header-packet ( player -- ? )
     [ stream-state>> ] [ packet>> ] bi ogg_stream_packetout {
-        { [ dup 0 <   ] [ throw-vorbis-error ] }
+        { [ dup 0 <   ] [ vorbis-error ] }
         { [ dup zero? ] [ drop f ] }
         [ drop t ]
     } cond ;
@@ -153,7 +153,7 @@ ERROR: no-vorbis-in-ogg ;
 
 : initialize-decoder ( vorbis-stream -- )
     dup #vorbis-headers>> zero?
-    [ throw-no-vorbis-in-ogg ]
+    [ no-vorbis-in-ogg ]
     [ init-vorbis-codec ] if ;
 
 : get-pending-decoded-audio ( vorbis-stream -- pcm len )