libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 237 insertions, 61 deletions

diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h
index dccd81e8a58..f716854bcb7 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h
@@ -33,7 +33,6 @@ extern "Java"
     {
       namespace sampled
       {
-          class AudioFormat;
           class Control;
           class Control$Type;
           class Line;
@@ -74,8 +73,9 @@ public:
   virtual void removeLineListener(::javax::sound::sampled::LineListener *);
   static ::java::lang::String * GST_BACKEND;
   static ::java::lang::String * GST_DECODER;
+  static ::java::lang::String * GST_TYPE_NAME;
+  static ::java::lang::String * GST_FILE_EXTENSION;
 private:
-  static JArray< ::javax::sound::sampled::AudioFormat * > * BASIC_FORMATS;
   static ::javax::sound::sampled::Mixer$Info * INFO;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h
index dbe3a676622..a6dc8fa7fae 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h
@@ -55,6 +55,9 @@ public:
   GstAudioFileReader();
   virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
   virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
+private:
+  ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *, ::java::lang::String *);
+public:
   virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
   virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
   virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h
index 0c9253c9d63..82878f19622 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h
@@ -11,6 +11,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace javax
     {
       namespace sound
@@ -59,12 +63,14 @@ public:
   static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *);
   static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::net::URL *);
 private:
+  static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *, ::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
   static ::javax::sound::sampled::AudioFormat$Encoding * getEncoding(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
   static ::javax::sound::sampled::AudioFormat * getAudioFormat(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
 public: // actually protected
-  static jboolean gstreamer_get_audio_format_stream(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *, ::java::io::BufferedInputStream *);
+  static jboolean gstreamer_get_audio_format_stream(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *, ::gnu::classpath::Pointer *);
   static jboolean gstreamer_get_audio_format_file(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *);
 private:
+  static void init_id_cache();
   static ::java::lang::String * GST_ENCODING;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h
new file mode 100644
index 00000000000..8ffb113e5ed
--- /dev/null
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
+#define __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace classpath
+    {
+        class Pointer;
+    }
+    namespace javax
+    {
+      namespace sound
+      {
+        namespace sampled
+        {
+          namespace gstreamer
+          {
+            namespace io
+            {
+                class GstInputStream;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::sound::sampled::gstreamer::io::GstInputStream : public ::java::lang::Object
+{
+
+public:
+  GstInputStream(::java::io::InputStream *);
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jint available();
+  virtual ::gnu::classpath::Pointer * getNativeClass();
+private:
+  void init_instance();
+  static void init_id_cache();
+  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) istream;
+  ::gnu::classpath::Pointer * gstInputStream;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h
deleted file mode 100644
index ed6df66aaf0..00000000000
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__
-#define __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace sound
-      {
-        namespace sampled
-        {
-          namespace gstreamer
-          {
-            namespace lines
-            {
-                class GstDataLine$State;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State : public ::java::lang::Enum
-{
-
-  GstDataLine$State(::java::lang::String *, jint);
-public:
-  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * > * values();
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * valueOf(::java::lang::String *);
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * PLAY;
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * PAUSE;
-  static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * STOP;
-private:
-  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h
index 7939abb3459..20ef7deb826 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h
@@ -24,7 +24,6 @@ extern "Java"
             namespace lines
             {
                 class GstDataLine;
-                class GstDataLine$State;
             }
           }
         }
@@ -56,15 +55,18 @@ public:
   virtual jint getBufferSize();
   virtual ::javax::sound::sampled::AudioFormat * getFormat();
   virtual jfloat getLevel();
-  virtual jboolean isRunning();
   virtual void addLineListener(::javax::sound::sampled::LineListener *);
   virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *);
   virtual JArray< ::javax::sound::sampled::Control * > * getControls();
   virtual ::javax::sound::sampled::Line$Info * getLineInfo();
   virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *);
   virtual jboolean isOpen();
-  virtual void open();
   virtual void removeLineListener(::javax::sound::sampled::LineListener *);
+public: // actually protected
+  virtual void setOpen(::java::lang::Boolean *);
+  virtual void setBufferSize(jint);
+  virtual void setFormat(::javax::sound::sampled::AudioFormat *);
+public:
   virtual jint available() = 0;
   virtual void drain() = 0;
   virtual void flush() = 0;
@@ -72,13 +74,14 @@ public:
   virtual jlong getLongFramePosition() = 0;
   virtual jlong getMicrosecondPosition() = 0;
   virtual jboolean isActive() = 0;
+  virtual jboolean isRunning() = 0;
   virtual void start() = 0;
   virtual void stop() = 0;
   virtual void close() = 0;
+  virtual void open() = 0;
   static const jint DEFAULT_BUFFER_SIZE = 1024;
 public: // actually protected
-  ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * __attribute__((aligned(__alignof__( ::java::lang::Object)))) state;
-  ::java::lang::Boolean * open__;
+  ::java::lang::Boolean * __attribute__((aligned(__alignof__( ::java::lang::Object)))) open;
 private:
   ::javax::sound::sampled::AudioFormat * format;
   jint bufferSize;
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h
index 5452434e1c7..e382f3ea47d 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h
@@ -11,6 +11,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace javax
     {
       namespace sound
@@ -22,6 +26,7 @@ extern "Java"
             namespace lines
             {
                 class GstNativeDataLine;
+                class GstPipeline;
             }
           }
         }
@@ -35,6 +40,11 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstNativeDataLine : public :
 
 public:
   GstNativeDataLine();
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * createSourcePipeline(jint);
+private:
+  static void init_id_cache();
+  static jboolean setup_sink_pipeline(::gnu::classpath::Pointer *);
+public:
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h
new file mode 100644
index 00000000000..a0de53f38d6
--- /dev/null
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
+#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
+
+#pragma interface
+
+#include <java/lang/Thread.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace sound
+      {
+        namespace sampled
+        {
+          namespace gstreamer
+          {
+            namespace lines
+            {
+                class GstPipeline;
+                class GstPipeline$CleanPipeline;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline : public ::java::lang::Thread
+{
+
+  GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *);
+public:
+  virtual void run();
+public: // actually package-private
+  GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *, ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline *);
+  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h
new file mode 100644
index 00000000000..5966084287a
--- /dev/null
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
+#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace sound
+      {
+        namespace sampled
+        {
+          namespace gstreamer
+          {
+            namespace lines
+            {
+                class GstPipeline$State;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State : public ::java::lang::Enum
+{
+
+  GstPipeline$State(::java::lang::String *, jint);
+public:
+  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * values();
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * valueOf(::java::lang::String *);
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PLAY;
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PAUSE;
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * STOP;
+  static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * CLOSE;
+private:
+  static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h
index a32150f9fe7..56afb46bae3 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/lang/Object.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -26,6 +28,7 @@ extern "Java"
             namespace lines
             {
                 class GstPipeline;
+                class GstPipeline$State;
             }
           }
         }
@@ -39,9 +42,49 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline : public ::java:
 
 public:
   GstPipeline();
+  GstPipeline(jint);
+  virtual void createForWrite();
+  virtual ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * getState();
+  virtual void close();
+  virtual void setState(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State *);
+  virtual ::gnu::classpath::Pointer * getNativeClass();
+  virtual jint write(JArray< jbyte > *, jint, jint);
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jint available();
+  virtual void drain();
+  virtual void flush();
+private:
+  void closePipe();
+  void prepareWrite();
+  static void init_id_cache();
+  static jboolean set_state(::gnu::classpath::Pointer *, jint);
+  static jint available(::gnu::classpath::Pointer *, jint);
+  static void open_native_pipe(::gnu::classpath::Pointer *, jint);
+  static void close_native_pipe(::gnu::classpath::Pointer *);
+  void init_instance();
+  jboolean create_named_pipe(::gnu::classpath::Pointer *);
+  jlong detect_pipe_size();
+public: // actually package-private
+  static ::gnu::classpath::Pointer * access$0(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *);
+  static void access$1(::gnu::classpath::Pointer *);
+  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State();
+private:
+  static const jint READ = 0;
+  static const jint WRITE = 1;
+  static const jint QUEUED = 1;
+  static ::java::lang::String * CAPACITY_KEY;
+  static JArray< ::java::lang::Object * > * lock;
+public: // actually protected
+  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
 private:
-  void setState();
-  ::gnu::classpath::Pointer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pipeline;
+  jlong capacity;
+  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * state;
+  ::java::lang::String * name;
+  ::java::io::FileOutputStream * output;
+  jboolean source;
+  jboolean ready;
+  ::gnu::classpath::Pointer * pipeline;
+  static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State__;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h
index 02b4b83ec9e..4120a2b2d07 100644
--- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h
+++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h
@@ -23,6 +23,7 @@ extern "Java"
           {
             namespace lines
             {
+                class GstPipeline;
                 class GstSourceDataLine;
             }
           }
@@ -47,6 +48,7 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstSourceDataLine : public :
 
 public:
   GstSourceDataLine(::javax::sound::sampled::AudioFormat *);
+  virtual void open();
   virtual void open(::javax::sound::sampled::AudioFormat *);
   virtual void open(::javax::sound::sampled::AudioFormat *, jint);
   virtual jint write(JArray< jbyte > *, jint, jint);
@@ -60,6 +62,11 @@ public:
   virtual void start();
   virtual void stop();
   virtual void close();
+  virtual jboolean isRunning();
+private:
+  ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine)))) pipeline;
+  jboolean open__;
+public:
   static ::java::lang::Class class$;
 };