[Gnash-commit] /srv/bzr/gnash/trunk r11592: move definitions to source file, from header file to avoid multiple instances.

[Rob Savoye]

------------------------------------------------------------
revno: 11592
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2009-10-29 16:32:33 -0600
message:
  move definitions to source file, from header file to avoid multiple instances.
modified:
  libmedia/gst/AudioInputGst.cpp
  libmedia/gst/AudioInputGst.h

=== modified file 'libmedia/gst/AudioInputGst.cpp'
--- a/libmedia/gst/AudioInputGst.cpp    2009-09-09 19:43:18 +0000
+++ b/libmedia/gst/AudioInputGst.cpp    2009-10-29 22:32:33 +0000
@@ -35,7 +35,29 @@
 namespace gnash {
 namespace media {
 namespace gst {
-       AudioInputGst::AudioInputGst() 
+
+GnashAudio::GnashAudio() {
+    _element = NULL;
+    _devLocation = NULL;
+    _gstreamerSrc = NULL;
+    _productName = NULL;
+};
+
+GnashAudioPrivate::GnashAudioPrivate() {
+    audioSource = NULL;
+    audioEnc = NULL;
+    _audioDevice = NULL;
+    _deviceName = NULL;
+    _pipeline = NULL;
+    _audioMainBin = NULL;
+    _audioPlaybackBin = NULL;
+    _audioSourceBin = NULL;
+    _audioSaveBin = NULL;
+    _pipelineIsPlaying = false;
+    _mux = NULL;
+};
+
+AudioInputGst::AudioInputGst() 
     {
                gst_init(NULL,NULL);
         

=== modified file 'libmedia/gst/AudioInputGst.h'
--- a/libmedia/gst/AudioInputGst.h      2009-08-07 19:56:42 +0000
+++ b/libmedia/gst/AudioInputGst.h      2009-10-29 22:32:33 +0000
@@ -113,14 +113,7 @@
         ///      device (e.g. Built-In Microphone or HDA Intel).
         gchar* _productName;
 };
-
-GnashAudio::GnashAudio() {
-    _element = NULL;
-    _devLocation = NULL;
-    _gstreamerSrc = NULL;
-    _productName = NULL;
-}
-
+ 
 /// \class GnashAudioPrivate
 ///
 /// \brief This class is initialized once a hardware input device is chosen
@@ -230,21 +223,7 @@
         /// element is currently in it's 'playing' state or not
         gboolean _pipelineIsPlaying;
 };
-
-GnashAudioPrivate::GnashAudioPrivate() {
-    audioSource = NULL;
-    audioEnc = NULL;
-    _audioDevice = NULL;
-    _deviceName = NULL;
-    _pipeline = NULL;
-    _audioMainBin = NULL;
-    _audioPlaybackBin = NULL;
-    _audioSourceBin = NULL;
-    _audioSaveBin = NULL;
-    _pipelineIsPlaying = false;
-    _mux = NULL;
-};
-
+ 
 /// \class AudioInputGst
 /// \brief The main AudioInputGst class, which actually doesn't store too
 /// much important information (most of that is stored in the GnashAudio