[Gnash-commit] [SCM] Gnash branch, master, updated. 54d730c333d57cbfed3c63d37c16a68dbf10f00a

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  54d730c333d57cbfed3c63d37c16a68dbf10f00a (commit)
       via  822c7c68dc00e95746ef479eab217f2d41932ee8 (commit)
       via  8476dabbecd4ba7a9aab178e8295f5592a5edbaf (commit)
      from  0597249609dc35bf2c10f5a3b0f7da4ced1ae04e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=54d730c333d57cbfed3c63d37c16a68dbf10f00a


commit 54d730c333d57cbfed3c63d37c16a68dbf10f00a
Merge: 822c7c6 0597249
Author: Sandro Santilli <address@hidden>
Date:   Fri Nov 26 12:11:34 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=822c7c68dc00e95746ef479eab217f2d41932ee8


commit 822c7c68dc00e95746ef479eab217f2d41932ee8
Author: Sandro Santilli <address@hidden>
Date:   Fri Nov 26 10:42:21 2010 +0100

    don't push NULL elements into the audio/video vectors. Should fix 
https://savannah.gnu.org/bugs/index.php?31771

diff --git a/libmedia/gst/AudioInputGst.cpp b/libmedia/gst/AudioInputGst.cpp
index 8ab7479..95abdc3 100644
--- a/libmedia/gst/AudioInputGst.cpp
+++ b/libmedia/gst/AudioInputGst.cpp
@@ -96,7 +96,7 @@ AudioInputGst::findAudioDevs()
     
     if (element == NULL) {
         log_error("%s: Could not create audio test source", __FUNCTION__);
-        _audioVect.push_back(NULL); // ??? what for ? FIXME
+       return;
     } else {
         _audioVect.push_back(new GnashAudio);
         _audioVect.back()->setElementPtr(element);
diff --git a/libmedia/gst/VideoInputGst.cpp b/libmedia/gst/VideoInputGst.cpp
index 3a861fa..a54a802 100644
--- a/libmedia/gst/VideoInputGst.cpp
+++ b/libmedia/gst/VideoInputGst.cpp
@@ -365,7 +365,7 @@ VideoInputGst::findVidDevs(std::vector<GnashWebcam*>& 
cameraList)
     
     if (element == NULL) {
         log_error("%s: Could not create video test source.", __FUNCTION__);
-        cameraList.push_back(NULL); // ??? what for ? FIXME
+       return;
     } else {
         cameraList.push_back(new GnashWebcam);
         GnashWebcam& cam = *cameraList.back();

http://git.savannah.gnu.org/cgit//commit/?id=8476dabbecd4ba7a9aab178e8295f5592a5edbaf


commit 8476dabbecd4ba7a9aab178e8295f5592a5edbaf
Author: Sandro Santilli <address@hidden>
Date:   Fri Nov 26 10:40:22 2010 +0100

    don't need a semicolon at function body end

diff --git a/libmedia/gst/AudioInputGst.h b/libmedia/gst/AudioInputGst.h
index 5b95212..6aa69fc 100644
--- a/libmedia/gst/AudioInputGst.h
+++ b/libmedia/gst/AudioInputGst.h
@@ -42,26 +42,26 @@ class GnashAudio {
         ///       to the audio source element.
         ///
         /// @return GstElement* to the audio source element
-        GstElement* getElementPtr() {return _element;};
+        GstElement* getElementPtr() {return _element;}
         
         /// \brief Accessor to set the private _element variable from
         ///       the GnashAudio class.
         ///
         /// @param element The GstElement pointer to the audio source element.
-        void setElementPtr(GstElement* element) {_element = element;};
+        void setElementPtr(GstElement* element) {_element = element;}
         
         /// \brief Accessor to get the private _devLocation variable from
         ///       the GnashAudio class.
         ///
         /// @return The _devLocation private variable from GnashAudio class.
-        gchar* getDevLocation() {return _devLocation;};
+        gchar* getDevLocation() {return _devLocation;}
         
         /// \brief Accessor to set the private _devLocation variable from
         ///       the GnashAudio class.
         ///
         /// @param l A gchar* containing the physical location of the audio
         ///       input hardware device.
-        void setDevLocation(gchar *l) {_devLocation = l;};
+        void setDevLocation(gchar *l) {_devLocation = l;}
         
         /// \brief Accessor to return the private _gstreamerSrc variable
         ///       from the GnashAudio class.
@@ -69,28 +69,28 @@ class GnashAudio {
         /// @return The _gstreamerSrc variable from the GnashAudio class.
         ///        which should contain the type of the Gstreamer audio source
         ///        element (e.g. pulsesrc).
-        gchar* getGstreamerSrc() {return _gstreamerSrc;};
+        gchar* getGstreamerSrc() {return _gstreamerSrc;}
         
         /// \brief Accessor to set the private _gstreamerSrc variable
         ///       from the GnashAudio class.
         ///
         /// @param s A gchar* containing the type of the Gstreamer source
         ///         element type (e.g. pulsesrc)
-        void setGstreamerSrc(gchar *s) {_gstreamerSrc = s;};
+        void setGstreamerSrc(gchar *s) {_gstreamerSrc = s;}
         
         /// \brief Accessor to get the private _productName variable
         ///       from the GnashAudio class.
         ///
         /// @return A gchar* containing the audio input's hardware name
         ///       (e.g. HDA Intel).
-        gchar* getProductName() {return _productName;};
+        gchar* getProductName() {return _productName;}
         
         /// \brief Accessor to set the private _productName variable
         ///       from the GnashAudio class.
         ///
         /// @param n A gchar* to the hardware input device's hardware name
         ///         (e.g. HDA Intel).
-        void setProductName(gchar *n) {_productName = n;};
+        void setProductName(gchar *n) {_productName = n;}
 
         /// Constructor for the GnashAudio class.
         GnashAudio();

-----------------------------------------------------------------------

Summary of changes:
 libmedia/gst/AudioInputGst.cpp |    2 +-
 libmedia/gst/AudioInputGst.h   |   16 ++++++++--------
 libmedia/gst/VideoInputGst.cpp |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash