wiretap 0.1 → 0.1.2

data/test_new/test_parts/simple_node_lookup_and_browsing.rb

@@ -0,0 +1,76 @@
+module TestSimpleNodeLookupAndBrowsing
+  def test_03_simple_node_lookup_and_browsing
+    @root = @server.root
+    assert_kind_of Wiretap::Node, @root, "Root of the server should be a Wiretap::RootNode"
+    assert_equal @test_host + '//', @root.uri, "Root of the server should have the uri of #{@test_host}//"
+    assert_equal '/', @root.id, "Root of the server should have the ID of /"
+    
+    assert_kind_of Wiretap::NodeChildren, @root.children, "Root should have NodeChildren as children"
+    assert_equal @root.children.length, @root.children.count, "NodeChildre#length should equal NodeChildren#count"
+    assert (@root.children.length > 0), "Root should have at least 1 node"
+    assert_equal @server, @root.server, "A root node should provide the handle to the server that it is attached to"
+    
+    assert !@root.reel?, "Root node is not a reel"
+    assert !@root.library?, "Root node is not a library"
+    assert !@root.clip?, "Root node is not a clip"
+    assert !@root.project?, "Root node is not a project"
+    assert_nil @root.parent, "Root node should not have a parent"
+    
+    assert_kind_of Wiretap::Volume, @root.children[0], "The first child should be a Volume node"
+    assert_kind_of Wiretap::Volume, @root[0], "The first child should be a Volume node and accessible via parent[]"
+    
+    @volume = @root.children[0]
+    assert_equal "stonefs", @volume.name, "Most likely the first child should be called /stonefs :-)"
+    assert_kind_of Wiretap::Node, @volume.parent, "The parent method should return the node above this one"
+    assert_equal "#{@test_host}//", @volume.parent.uri, "And this should be the root node of the server"
+    assert_equal @server, @volume.server, "A volume should provide the handle to the server that it is attached to"
+    
+    @project = @volume.children[0]
+    assert_kind_of Wiretap::Project, @project, "The first node of the volume should be a project"
+    
+    assert_equal @project, @volume[0], "The child node shoud be accessible directly via []"
+    assert_kind_of Wiretap::NodeChildren, @project.children, "Project should have NodeChildren as children"
+
+    assert_kind_of String, @project.name, "The project should have a name and it should be a String"
+    proj_uri = "#{@test_host}//#{@volume.name}/#{@project.name}"
+    assert_equal proj_uri, @project.uri, "The project should have the uri #{proj_uri}"
+    
+    assert_equal @project, @server.find("//#{@volume.name}/#{@project.name}"), "The server should support name-based lookup via uri"
+    assert_equal @project, @volume.find(@project.name), "The volume node should support name-based lookup via name"
+    
+    @root_meta, @project_meta = @root.metadata, @project.meta
+    
+    assert_kind_of Wiretap::NodeMetaData, @root_meta
+    assert_kind_of Array, @root_meta.streams
+    assert @root_meta.streams.empty?, "Root metadata streams are most likely empty"
+    
+    assert_kind_of Wiretap::NodeMetaData, @project_meta
+    assert @root_meta.streams.empty?, "Project metadata streams are most likely empty (unless this is a 2007 server)"
+    
+    # Now try to find a project that has some libraries
+    @volume.children.each do | p |
+      @project = p and break if p.children.any?
+    end
+    
+    # We proceed only of this project HAS children (by occasion)
+    unless @project
+      $stderr.puts "We could not find any projects that have libraries on #{@test_host}, so the test will be skipped"
+      return
+    end
+    
+    @lib = @project[0]
+    assert_equal @lib, @project.children[0], "node[i] and node.children[i] should return equivalent results"
+    assert_kind_of Wiretap::Library, @lib, "A child of a project can only be a Library"
+    
+    assert @lib.library?, "Library node is a library"
+    assert !@lib.reel?, "Library node is not a reel"
+    assert !@lib.clip?, "Library node is not a clip"
+    assert !@lib.project?, "Library node is not a project"
+    assert_equal @project, @lib.parent, "Library node should have the project as parent"
+    assert_kind_of String, @lib.name, "Library node should have a name in a String"
+
+    return if @lib.name.empty?
+    assert_equal @lib, @project[0], "The library fetched by index from the project should be equivalent to the one we retrieved"
+    assert_equal @lib, @project[@lib.name], "The library fetched by name from the project should be equivalent to the one we retrieved"
+  end
+end

data/test_new/test_suite.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/common'
+
+class RubyWiretapTest < Test::Unit::TestCase
+  OLD_SERVER = " This functionality is only supported in hosts running 2007."
+  CLIP_TYPE_METHODS = %(
+    node?
+    clip?
+    root?
+    desktop?
+    project?
+    library?
+    user?
+    audio?
+    hires?
+    lowres?
+    slate?
+  )
+  HAS_OPEN = (RUBY_PLATFORM =~ /darwin/i) ? true : false
+  
+  modules_dir = File.dirname(__FILE__) + '/test_parts'
+  Dir.entries(modules_dir).grep(/\.rb$/).each do | p |
+    require File.join(modules_dir, p)
+    modname = p.gsub(/\.rb$/, '')
+    self.send(:include, Inflector::camelize("test_" + modname).constantize)
+  end
+  
+  def setup
+    @test_host = ENV['RUBY_WIRETAP_TEST_HOST'] || 'Backdraft'
+    @test_project_name = ENV['RUBY_WIRETAP_TEST_PROJECT'] || "RubyWiretapTest"
+    @test_library = ENV['RUBY_WIRETAP_TEST_LIBRARY'] || "Default"
+    @test_run = ENV['RUBY_WIRETAP_TEST_RUN'] || Time.now.to_i.to_s
+    
+    @server = Wiretap::Server.new(@test_host)
+    @volume = @server.root[0]
+    @deletables = []
+    
+  end
+  
+  def teardown
+    begin
+      @server.close! if @server
+    rescue Wiretap::Error # if the connecton has been closed in the test itself
+    end
+    
+    while(elem = @deletables.pop) do
+      begin
+        # We run destroy twice here to ascertain that it does not do anything nasty 
+        elem.destroy
+        elem.destroy
+      rescue Wiretap::Error
+      end
+    end
+  end
+  
+  def test_07_ppm_uploads
+    # flunk
+  end
+    
+  private
+    def open_images_in_viewer(imgs, specialty = nil)
+      if imgs.any?
+        $stderr.puts "Don't be scared - after a few seconds some images will open in your image editor. Take care to examine them
+    carefully - you should see a rotating color cube!  #{specialty}"
+        sleep 5
+        imgs.each do | c |
+          `open #{c}` if HAS_OPEN
+        end
+      end
+    end
+end

data/{test/convert.rb → test_new/test_thread_worker.rb}

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../lib/wiretap'
 require 'benchmark'
 
 
-class ConvertTest < Test::Unit::TestCase
+class ThreadWorkerTest < Test::Unit::TestCase
 
   def setup
     @temp_outdir = "/tmp/wiretap_tests/thread_convert"
@@ -11,8 +11,7 @@ class ConvertTest < Test::Unit::TestCase
     `mkdir -p #{@temp_outdir} 2>/dev/null`
   end
   
-
-  def test_convert
+  def xtest_convert
     num = 1
     iteration = 0
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.8.11
 specification_version: 1
 name: wiretap
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-01-23 00:00:00 +03:00
+  version: 0.1.2
+date: 2007-02-01 00:00:00 +01:00
 summary: WireTap driver
 require_paths: 
 - lib
-email: max@maxidoors.ru
+email: tools@hecticelectric.nl
 homepage: http://rubyforge.org/projects/wiretap/
 rubyforge_project: wiretap
 description: 
@@ -25,72 +25,82 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
-post_install_message: 
 authors: 
-- Max Lapshin
+- Max Lapshin, Julik Tarkhanov, HecticElectric BV
 files: 
-- test/audio.rb
-- test/convert.rb
-- test/image.rb
-- test/read_frames.rb
-- test/wiretap-images
-- test/wiretap_root
-- test/write_frames.rb
-- test/wiretap-images/01.ppm
-- test/wiretap-images/32bit.stoneimage
-- test/wiretap-images/36bit.stoneimage
-- test/wiretap-images/48bit.stoneimage
-- test/wiretap-images/a.stoneimage
-- test/wiretap-images/a0.stoneimage
-- test/wiretap-images/a1.stoneimage
-- test/wiretap-images/a2.stoneimage
-- test/wiretap-images/a3.stoneimage
-- test/wiretap-images/a4.stoneimage
-- test/wiretap-images/b1.stonesound
-- test/wiretap-images/importable-seq
-- test/wiretap-images/monsters_001.tif
-- test/wiretap-images/monsters_002.tif
-- test/wiretap-images/monsters_003.tif
-- test/wiretap-images/output.mov
-- test/wiretap-images/output.wav
-- test/wiretap-images/importable-seq/00000001.ppm
-- test/wiretap-images/importable-seq/00000002.ppm
-- test/wiretap-images/importable-seq/00000003.ppm
-- test/wiretap-images/importable-seq/00000004.ppm
-- test/wiretap-images/importable-seq/00000005.ppm
-- test/wiretap-images/importable-seq/00000006.ppm
-- test/wiretap-images/importable-seq/00000007.ppm
-- test/wiretap-images/importable-seq/00000008.ppm
-- test/wiretap-images/importable-seq/00000009.ppm
-- test/wiretap-images/importable-seq/00000010.ppm
-- test/wiretap-images/importable-seq/00000011.ppm
-- test/wiretap-images/importable-seq/00000012.ppm
-- test/wiretap_root/192.168.171.17
-- test/wiretap_root/192.168.171.208
-- test/wiretap_root/192.168.171.17/stonefs
-- test/wiretap_root/192.168.171.17/stonefs/Julik
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default/freckles_8bit_snd
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default/toyota_10bit
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default/toyota_12bit
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default/freckles_8bit_snd/freckles_8bit_snd (audio)
-- test/wiretap_root/192.168.171.17/stonefs/Julik/Default/freckles_8bit_snd/freckles_8bit_snd (audio)/freckles_8bit_snd (stream)
+- test_new/common.rb
+- test_new/fixtures
+- test_new/test_audio_conversions.rb
+- test_new/test_image_conversions.rb
+- test_new/test_parts
+- test_new/test_suite.rb
+- test_new/test_thread_worker.rb
+- test_new/fixtures/img
+- test_new/fixtures/raw
+- test_new/fixtures/raw-snd
+- test_new/fixtures/snd
+- test_new/fixtures/img/ppm-8bit
+- test_new/fixtures/img/sgi-16bit-rle
+- test_new/fixtures/img/sgi-16bit-std
+- test_new/fixtures/img/sgi-8bit-rle
+- test_new/fixtures/img/sgi-8bit-std
+- test_new/fixtures/img/ppm-8bit/01.ppm
+- test_new/fixtures/raw/cube_2k_12bitP_1f
+- test_new/fixtures/raw/cube_2k_8bit_1f
+- test_new/fixtures/raw/cube_SD_10bit_5f
+- test_new/fixtures/raw/cube_SD_12bitP_5f
+- test_new/fixtures/raw/cube_SD_12bitU_5f
+- test_new/fixtures/raw/cube_SD_8bit_8f
+- test_new/fixtures/raw/cube_2k_12bitP_1f/0.stoneimage
+- test_new/fixtures/raw/cube_2k_8bit_1f/0.stoneimage
+- test_new/fixtures/raw/cube_SD_10bit_5f/0.stoneimage
+- test_new/fixtures/raw/cube_SD_10bit_5f/1.stoneimage
+- test_new/fixtures/raw/cube_SD_10bit_5f/2.stoneimage
+- test_new/fixtures/raw/cube_SD_10bit_5f/3.stoneimage
+- test_new/fixtures/raw/cube_SD_10bit_5f/4.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitP_5f/0.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitP_5f/1.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitP_5f/2.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitP_5f/3.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitP_5f/4.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitU_5f/0.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitU_5f/1.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitU_5f/2.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitU_5f/3.stoneimage
+- test_new/fixtures/raw/cube_SD_12bitU_5f/4.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/0.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/1.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/2.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/3.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/4.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/5.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/6.stoneimage
+- test_new/fixtures/raw/cube_SD_8bit_8f/7.stoneimage
+- test_new/fixtures/raw-snd/simple.stonesound
+- test_new/fixtures/snd/simple-wave.wav
+- test_new/test_parts/connect_to_test_host.rb
+- test_new/test_parts/constants.rb
+- test_new/test_parts/create_test_project.rb
+- test_new/test_parts/raw_formats_and_uploads.rb
+- test_new/test_parts/server_list.rb
+- test_new/test_parts/simple_node_lookup_and_browsing.rb
 - lib/wiretap.rb
 - ext/audio_format.cpp
-- ext/bmp.cpp
+- ext/charstream.h
 - ext/extconf.rb
 - ext/format.cpp
-- ext/image.h
+- ext/frame_io.cpp
+- ext/frame_io.h
 - ext/image_format.cpp
+- ext/image_io.cpp
+- ext/image_io.h
 - ext/Makefile
 - ext/node.cpp
 - ext/nodechildren.cpp
 - ext/nodeframes.cpp
 - ext/nodemetadata.cpp
-- ext/ppm.cpp
 - ext/server.cpp
 - ext/serverlist.cpp
-- ext/sgi.cpp
 - ext/testserver
 - ext/thread_worker.cpp
 - ext/wiretap.cpp
@@ -106,11 +116,11 @@ files:
 - README
 - LICENSE
 test_files: 
-- test/audio.rb
-- test/convert.rb
-- test/image.rb
-- test/read_frames.rb
-- test/write_frames.rb
+- test_new/common.rb
+- test_new/test_audio_conversions.rb
+- test_new/test_image_conversions.rb
+- test_new/test_suite.rb
+- test_new/test_thread_worker.rb
 rdoc_options: 
 - --main=README
 - --line-numbers

data/ext/bmp.cpp

@@ -1,65 +0,0 @@
-#include "wiretap.h"
-static void write_int32_le_value(int value, bitstream_writer writer, void *data) {
-	writer(data, value >> 0 & 0xFF);  
-	writer(data, value >> 8 & 0xFF);  
-	writer(data, value >> 16& 0xFF);  
-	writer(data, value >> 24& 0xFF);
-}
-
-static void write_int16_le_value(short value, bitstream_writer writer, void *data) {
-	writer(data, value >> 0 & 0xFF);  
-	writer(data, value >> 8 & 0xFF);  
-}
-
-void write_string_value(char* value, bitstream_writer writer, void *data) {
-	while(value && *value) {
-		writer(data, *value);
-		value++;
-	}
-}
-
-
-static int wiretap_write_bmp_header(int width, int height, bitstream_writer writer, void *data) {
-	const int header_size = 54;
-	int size = header_size + width * height * 3;
-	write_string_value("BM", writer, data); //  0,1 
-	write_int32_le_value(size, writer, data); // 2,3,4,5
-	write_int32_le_value(0, writer, data); // 6,7,8,9: reserved data
-	write_int32_le_value(header_size, writer, data); // 10,11,12,13: Image header ends.
-	write_int32_le_value(40, writer, data); // 14,15,16,17: Image information size
-	write_int32_le_value(width, writer, data); // 18,19,20,21: Width
-	write_int32_le_value(height, writer, data); // 22,23,24,25: Height
-	write_int16_le_value(1, writer, data); // 26,27: Number of color planes
-    write_int16_le_value(24, writer, data); // 28,29: Bits per pixel. We write only 24 bit images
-    write_int32_le_value(0, writer, data); // 30,31,32,33: Compression schema. None
-    write_int32_le_value(width*height*3, writer, data); // 34,35,36,37: raw data size. 3 bytes per pixel.
-	write_int32_le_value(2834, writer, data); // 38,39,40,41: horisontal resolution. Perhaprs 72 dpi. I don't know
-	write_int32_le_value(2834, writer, data); // 42,43,44,45: vertical resolution
-	write_int32_le_value(0, writer, data); // 46,47,48,49: number of colors
-	write_int32_le_value(0, writer, data); // 50,51,52,53: number of important colors
-	return 0;
-}
-
-
-
-bool wiretap_write_frame_bmp(int width, int height, int bpp, unsigned char* frame, FILE* f) {
-	filestream stream;
-	memset(&stream, 0, sizeof(stream));
-	stream.f = f;
-	
-	wiretap_write_bmp_header(width, height, write_to_file, (void *)&stream);
-	wiretap_write_image_data(width, height, bpp, frame, write_to_file_bgr, (void *)&stream);
-
-	return 0;
-}
-
-void write_to_file_bgr(void *stream, unsigned char channel) {
-	filestream* data = (filestream *)stream;
-	data->buffer[2 - data->count] = channel;
-	data->count++;
-	if(data->count == 3) {
-		fwrite(data->buffer, sizeof(data->buffer), 1, data->f);
-		data->count = 0;
-	}
-}
-

data/ext/image.h

@@ -1,27 +0,0 @@
-#ifndef _WIRETAP_IMAGE_H_
-#define _WIRETAP_IMAGE_H_
-
-typedef struct _memstream {
-	unsigned char* ptr;
-} memstream;
-typedef struct _filestream {
-	int count;
-	unsigned char buffer[3];
-	FILE* f;
-} filestream;
-
-void write_to_memory(void *stream, unsigned char channel);
-void write_to_file(void* file, unsigned char channel);
-void write_to_file_bgr(void* file, unsigned char channel);
-typedef void (*bitstream_writer)(void *data, unsigned char channel);
-void write_string_value(char* value, bitstream_writer writer, void *data);
-
-
-bool wiretap_write_frame_bmp(int width, int height, int bpp, unsigned char* frame, FILE* f);
-bool wiretap_write_frame_sgi(int width, int height, int bpp, unsigned char* frame, FILE* f);
-
-int wiretap_write_image_data(int width, int height, int bpp, const unsigned char* frame, bitstream_writer writer, void *data);
-
-#endif /* _WIRETAP_IMAGE_H_ */
-
-

data/ext/ppm.cpp

@@ -1,132 +0,0 @@
-#include "wiretap.h"
-
-
-
-static int extract_int(FILE* f) {
-	char buffer[256];
-	int pos = 0;
-	char c;
-	while(!feof(f)) {
-		c = fgetc(f);
-		if(!isalnum(c)) {
-			break;
-		}
-		buffer[pos++] = c;
-	}
-	buffer[pos] = '\0';
-	return atoi(buffer);
-}
-
-bool ppm_read_format(FILE* f, WireTapClipFormat* format) {
-	extract_int(f);
-	
-	int width = extract_int(f);
-	if(format) {
-		format->setWidth(width);
-	}
-	
-	int height = extract_int(f);
-	if(format) {
-		format->setHeight(height);
-	}
-	
-	int maxval = extract_int(f);
-	if(maxval > 255) {
-		THROW("Decoding 16bit PPM files is not supported");
-	}
-	
-	if(format) {
-		format->setBitsPerPixel(24);
-		format->setNumChannels(3);
-		format->setFrameBufferSize((format->bitsPerPixel()/8)*width*height);
-		format->setFrameRate(25);
-		WireTapClipFormat::ScanFormat scan_format = format->strToScanFormat("progressive");
-		format->setScanFormat(scan_format);
-		format->setFormatTag("rgb");
-		format->setMetaDataTag("IFFFS_XML");
-		format->setMetaData("<IFFFS_XML Version=\"1.0\"><ClipData></ClipData></IFFFS_XML>");
-	}
-	
-	return true;
-}
-
-
-bool ppm_read_image(FILE* f, unsigned char* frame, int width, int height, int bpp) {
-	size_t row_size = width*3;
-  
-	for(int i = 0; i < height; i++) {
-		size_t read_bytes = fread(frame + (height - 1 - i)*row_size, 1, row_size, f);
-		if(read_bytes != row_size) {
-			rb_warn("Read %d bytes, expected %d. Step: %d", read_bytes, row_size, i);
-			return false;
-		}
-	}
-
-	return true;
-}
-
-
-/*
- * Extract Wiretap clip format from PPM file. The format will inherit the bit depths of the image and allocate
- * the framebuffer size into which the imported image will fit
- *
- *      @clipformat = Wiretap::PPM.format("test/wiretap-images/01.ppm")
- */
-static VALUE wiretap_get_ppm_format(VALUE self, VALUE input) {
-
-	FILE* infile = fopen(CSTR(input), "r");
-	if(!infile) {
-		THROW("Couldn't open file %s for reading", CSTR(input));
-	}
-	WireTapClipFormat format;
-	if(!ppm_read_format(infile, &format)) {
-		fclose(infile);
-		return Qfalse;
-	}
-	fclose(infile);
-	VALUE clip_format = rb_funcall(cClipFormat, rb_intern("new"), 0);
-	DATA_PTR(clip_format) = new WireTapClipFormat(format);
-	return clip_format;
-}
-
-/*
- * Convert a PPM file to an SGI file
- *
- *     Wiretap::PPM.to_sgi("test/wiretap-images/01.ppm", "/tmp/a.sgi")
- */
-static VALUE wiretap_convert_ppm_to_sgi(VALUE self, VALUE input, VALUE output) {
-	Check_Type(input, T_STRING);
-	Check_Type(output, T_STRING);
-	FILE* infile = fopen(CSTR(input), "r");
-	if(!infile) {
-		THROW("Couldn't open file %s for read", CSTR(input));
-	}
-	WireTapClipFormat format;
-	if(!ppm_read_format(infile, &format)) {
-		fclose(infile);
-		rb_warn("Couldn't read PPM format from file %s", CSTR(input));
-		return Qfalse;
-	}
-	
-	unsigned char frame[format.frameBufferSize()];
-	if(!ppm_read_image(infile, frame, format.width(), format.height(), format.bitsPerPixel())) {
-		fclose(infile);
-		rb_warn("Couldn't read PPM image data from file %s", CSTR(input));
-		return Qfalse;
-	}
-	fclose(infile);
-
-	if(!wiretap_write_image_frame(format.width(), format.height(), format.bitsPerPixel(), frame, CSTR(output))) {
-		rb_warn("Couldn't dump image to file %s", CSTR(output));
-		return Qfalse;
-	}
-	return Qtrue;
-}
-
-
-void Init_ppm() {
-	mPPM = rb_define_module_under(mWiretap, "PPM");
-
-	rb_define_singleton_method(mPPM, "to_sgi", VALUEFUNC(wiretap_convert_ppm_to_sgi), 2);
-	rb_define_singleton_method(mPPM, "format", VALUEFUNC(wiretap_get_ppm_format), 1);
-}

data/ext/sgi.cpp

@@ -1,69 +0,0 @@
-#include "wiretap.h"
-
-
-static void write_channel(int width, int height, int number, unsigned char* frame, FILE* f) {
-	std::auto_ptr<unsigned char> buffer(new unsigned char[width*height]);
-	for(int i = 0; i < width*height; i++) {
-		buffer.get()[i] = frame[3*i + number];
-	}
-	fwrite(buffer.get(), width*height, 1, f);
-}
-
-static void write_int32_be_value(int value, bitstream_writer writer, void *data) {
-	writer(data, value >> 24& 0xFF);  
-	writer(data, value >> 16& 0xFF);  
-	writer(data, value >> 8 & 0xFF);  
-	writer(data, value >> 0 & 0xFF);  
-}
-static void write_int16_be_value(short value, bitstream_writer writer, void *data) {
-	writer(data, value >> 8 & 0xFF);  
-	writer(data, value >> 0 & 0xFF);  
-}
-
-static int wiretap_write_sgi_header(int width, int height, bitstream_writer writer, void *data) {
-	//const int header_size = 512;
-	const int header_padding = 404;
-	const int magic = 474;
-	
-	write_int16_be_value(magic, writer, data);  // Magic 474
-	writer(data, 0); // 0 for uncompressed
-	writer(data, 1); // 1 for 1 byte per channel. 24 bit picture
-	write_int16_be_value(3, writer, data); // 3 dimensions - one plain image with multiple channels
-	write_int16_be_value(width, writer, data); 
-	write_int16_be_value(height, writer, data); 
-	write_int16_be_value(3, writer, data); // 3 for RGB mode: 3 channels
-	write_int32_be_value(0, writer, data); // minimum pixel value
-	write_int32_be_value(0xFF, writer, data); // maximum pixel value
-	write_int32_be_value(0, writer, data); // dummy
-	
-	char image_name[80] = "Ruby wiretap encoded";
-	for(size_t i = 0; i < sizeof(image_name); i++) {
-		writer(data, image_name[i]);
-	}
-	
-	write_int32_be_value(0, writer, data); // colormap is in normal mode (0)
-	for(int i = 0; i < header_padding; i++) {
-		writer(data, 0);
-	}
-	return 0;
-}
-
-
-bool wiretap_write_frame_sgi(int width, int height, int bpp, unsigned char* frame, FILE* f) {
-	filestream stream;
-	memstream mem;
-	std::auto_ptr<unsigned char> buffer(new unsigned char[width*height*3]);
-	memset(&stream, 0, sizeof(stream));
-	memset(&mem, 0, sizeof(mem));
-	mem.ptr = buffer.get();
-	stream.f = f;
-
-	wiretap_write_sgi_header(width, height, write_to_file, (void *)&stream);
-	wiretap_write_image_data(width, height, bpp, frame, write_to_memory, (void *)&mem);	
-
-	write_channel(width, height, 0, buffer.get(), f);
-	write_channel(width, height, 1, buffer.get(), f);
-	write_channel(width, height, 2, buffer.get(), f);
-	return 0;
-}
-

data/test/audio.rb

@@ -1,27 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/wiretap'
-
-class AudioTest < Test::Unit::TestCase
-  
-  def setup
-    @samples = 48000
-    @rate = 48000.0
-    @bps = 32
-    @temp_outdir = "/tmp/wiretap_tests"
-    FileUtils.mkdir(@temp_outdir) rescue nil
-  end
-  
-  def test_read_audio
-    File.open(File.dirname(__FILE__) + "/wiretap-images/b1.stonesound") do |f|
-      Wiretap.dump_audio_data(@samples, @rate, @bps, :dlaudio_float, f.read(@samples*@bps/8), "#{@temp_outdir}/b1.aiff")
-      assert_equal "#{@temp_outdir}/b1.aiff: IFF data, AIFF audio\n", `file #{@temp_outdir}/b1.aiff`
-    end
-  end
-  
-  def test_get_format
-    assert @format = Wiretap.audio_format(File.dirname(__FILE__) + "/wiretap-images/output.wav")
-    assert_equal 16, @format.bps
-    assert_equal 48000.0, @format.rate
-    assert_equal 97280, @format.samples
-  end
-end