[gstreamermm] Minor typos and formatting. Minor code adjustments (for consistency).
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Subject: [gstreamermm] Minor typos and formatting. Minor code adjustments (for consistency).
- Date: Sun, 24 May 2009 16:09:48 -0400 (EDT)
commit 02b80b5502c995843a7d94d4c4b9635a23508766
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Sun May 24 16:08:24 2009 -0400
Minor typos and formatting. Minor code adjustments (for consistency).
---
ChangeLog | 55 ++++++++++++++++++++++++++----------------
examples/optiongroup/main.cc | 1 +
gstreamer/src/bin.ccg | 2 +-
gstreamer/src/bin.hg | 1 -
gstreamer/src/element.ccg | 2 +-
gstreamer/src/ghostpad.ccg | 2 +-
tests/test-caps.cc | 5 +--
tests/test-iterator.cc | 4 +++
tests/test-plugin-signals.cc | 5 +--
9 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3fc4220..815a818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,39 @@
+2009-05-24 José Alburquerque <jaalburqu svn gnome org>
+
+ * examples/optiongroup/main.cc:
+ * gstreamer/src/bin.ccg:
+ * gstreamer/src/bin.hg:
+ * gstreamer/src/element.ccg:
+ * gstreamer/src/ghostpad.ccg:
+ * tests/test-caps.cc:
+ * tests/test-iterator.cc:
+ * tests/test-plugin-signals.cc: Minor typos and formatting. Minor
+ code adjustments (for consistency).
+
2009-05-20 Johannes Schmid <jschmid openismus com>
- * examples/element_link/element_link.cc:
- * examples/media_player_gtkmm/main.cc:
- * examples/media_player_gtkmm/player_window.cc:
- * examples/optiongroup/main.cc
- Fixed examples to build with disabled exceptions and disabled properties
-
- * gstreamer/src/bin.ccg:
- * gstreamer/src/bin.hg:
- * gstreamer/src/element.ccg:
- * gstreamer/src/element.hg:
- * gstreamer/src/ghostpad.ccg:
- * gstreamer/src/ghostpad.hg:
- Report runtime exceptions to stderr if exceptions are disabled
-
- * tests/test-caps.cc:
- * tests/test-init-check-noargs.cc
- * tests/test-plugin-signals.cc
- Fixed test-cases to build with disabled exceptions and properties
-
- * tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
- Fixed build with disabled exceptions
+ * examples/element_link/element_link.cc:
+ * examples/media_player_gtkmm/main.cc:
+ * examples/media_player_gtkmm/player_window.cc:
+ * examples/optiongroup/main.cc:
+ Fixed examples to build with disabled exceptions and disabled
+ properties
+
+ * gstreamer/src/bin.ccg:
+ * gstreamer/src/bin.hg:
+ * gstreamer/src/element.ccg:
+ * gstreamer/src/element.hg:
+ * gstreamer/src/ghostpad.ccg:
+ * gstreamer/src/ghostpad.hg:
+ Report runtime exceptions to stderr if exceptions are disabled
+
+ * tests/test-caps.cc:
+ * tests/test-init-check-noargs.cc:
+ * tests/test-plugin-signals.cc:
+ Fixed test-cases to build with disabled exceptions and properties
+
+ * tools/extra_defs_gen/generate_plugin_gmmproc_file.cc:
+ Fixed build with disabled exceptions
2009-05-20 José Alburquerque <jaalburqu svn gnome org>
diff --git a/examples/optiongroup/main.cc b/examples/optiongroup/main.cc
index ac74ca7..171eeb4 100644
--- a/examples/optiongroup/main.cc
+++ b/examples/optiongroup/main.cc
@@ -53,6 +53,7 @@ int main(int argc, char** argv)
Glib::OptionGroup m_GstOptiongroup = Gst::get_option_group();
m_OptionContext.add_group(m_GstOptiongroup);
+
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
diff --git a/gstreamer/src/bin.ccg b/gstreamer/src/bin.ccg
index 70d9206..0f4b806 100644
--- a/gstreamer/src/bin.ccg
+++ b/gstreamer/src/bin.ccg
@@ -85,7 +85,7 @@ void Bin::handle_error(const Glib::ustring& message)
#ifdef GLIBMM_EXCEPTIONS_ENABLED
throw std::runtime_error(message);
#else
- std::cerr << "GStreamermm: " << message << std::endl;
+ std::cerr << "gstreamermm: " << message << std::endl;
#endif
}
diff --git a/gstreamer/src/bin.hg b/gstreamer/src/bin.hg
index 6d5da33..ea39d98 100644
--- a/gstreamer/src/bin.hg
+++ b/gstreamer/src/bin.hg
@@ -162,7 +162,6 @@ public:
* @throws std::runtime_error if the Bin does not want to accept the Element.
*/
Glib::RefPtr<Gst::Bin> add(const Glib::RefPtr<Gst::Element>& element);
-
_IGNORE(gst_bin_add, gst_bin_add_many)
/** Removes the element from the bin, unparenting it as well. Unparenting the
diff --git a/gstreamer/src/element.ccg b/gstreamer/src/element.ccg
index cdf0be1..9478624 100644
--- a/gstreamer/src/element.ccg
+++ b/gstreamer/src/element.ccg
@@ -243,7 +243,7 @@ void Element::handle_error(const Glib::ustring& message)
#ifdef GLIBMM_EXCEPTIONS_ENABLED
throw std::runtime_error(message);
#else
- std::cerr << "GStreamermm: " << message << std::endl;
+ std::cerr << "gstreamermm: " << message << std::endl;
#endif
}
diff --git a/gstreamer/src/ghostpad.ccg b/gstreamer/src/ghostpad.ccg
index 5b78348..6f9ed33 100644
--- a/gstreamer/src/ghostpad.ccg
+++ b/gstreamer/src/ghostpad.ccg
@@ -116,7 +116,7 @@ void GhostPad::handle_error(const Glib::ustring& message)
#ifdef GLIBMM_EXCEPTIONS_ENABLED
throw std::runtime_error(message);
#else
- std::cerr << "GStreamermm: " << message << std::endl;
+ std::cerr << "gstreamermm: " << message << std::endl;
#endif
}
diff --git a/tests/test-caps.cc b/tests/test-caps.cc
index f85fa8e..f75bedc 100644
--- a/tests/test-caps.cc
+++ b/tests/test-caps.cc
@@ -94,16 +94,15 @@ int main (int argc, char* argv[])
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
+#endif
pipeline->add(e1)->add(e2);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch (std::runtime_error& ex)
{
std::cerr << "Exception while adding: " << ex.what() << std::endl;
return 1;
}
-#else
- // Will report errors to stderr
- pipeline->add(e1)->add(e2);
#endif
if(!link_elements_with_filter(e1, e2))
diff --git a/tests/test-iterator.cc b/tests/test-iterator.cc
index cd995ac..6359647 100644
--- a/tests/test-iterator.cc
+++ b/tests/test-iterator.cc
@@ -46,6 +46,7 @@ int main (int argc, char* argv[])
int iterations = 0;
Gst::Iterator<Gst::Element> elements = bin->iterate_elements();
Gst::Iterator<Gst::Element> firstIter;
+
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
@@ -100,11 +101,13 @@ int main (int argc, char* argv[])
std::endl << e.what() << std::endl;
}
#endif
+
std::cout << std::endl <<
"The following are standard GStreamer formats:" << std::endl;
Gst::IteratorBasic<const Gst::FormatDefinition> formats =
Gst::iterate_format_definitions();
+
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
@@ -122,5 +125,6 @@ int main (int argc, char* argv[])
std::endl << e.what() << std::endl;
}
#endif
+
return 0;
}
diff --git a/tests/test-plugin-signals.cc b/tests/test-plugin-signals.cc
index 78d3147..d7c1b19 100644
--- a/tests/test-plugin-signals.cc
+++ b/tests/test-plugin-signals.cc
@@ -83,7 +83,9 @@ int main(int argc, char* argv[])
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
+#endif
pipeline->add(source)->add(sink);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(const Glib::Error& ex)
{
@@ -92,9 +94,6 @@ int main(int argc, char* argv[])
return -1;
}
-#else
- // Errors will go to stdout
- pipeline->add(source)->add(sink);
#endif
// Link together:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]