[svn r858] fixed debian scripts trunk
authorrenatofilho
Tue Sep 18 18:20:50 2007 +0100 (2007-09-18)
branchtrunk
changeset 8522498e4f8c758
parent 851 2b109fc895ae
child 853 c738c2ac1968
[svn r858] fixed debian scripts
gmyth/debian/changelog
gst-gmyth/autogen.sh
gst-gmyth/debian/control
gst-gmyth/mythsrc/Makefile.am
gst-gmyth/playbinmaemo/gstplaybinmaemo.c
gst-gmyth/playbinmaemo/gstplaybinmaemo.h
libgnomevfs2-mythtv/debian/changelog
libgnomevfs2-mythtv/debian/control
     1.1 --- a/gmyth/debian/changelog	Tue Sep 18 18:19:39 2007 +0100
     1.2 +++ b/gmyth/debian/changelog	Tue Sep 18 18:20:50 2007 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -gmyth (0.4) unstable; urgency=low
     1.5 +gmyth (0.4-indt1) unstable; urgency=low
     1.6  
     1.7    * Bug fixes
     1.8    * Improvements in the schedule management (add all schedule, add exception, ...)
     2.1 --- a/gst-gmyth/autogen.sh	Tue Sep 18 18:19:39 2007 +0100
     2.2 +++ b/gst-gmyth/autogen.sh	Tue Sep 18 18:20:50 2007 +0100
     2.3 @@ -4,7 +4,7 @@
     2.4  srcdir=`dirname $0`
     2.5  test -z "$srcdir" && srcdir=.
     2.6  
     2.7 -PKG_NAME="gmemcoder"
     2.8 +PKG_NAME="gstreamer elements"
     2.9  
    2.10  (test -f $srcdir/configure.ac) || {
    2.11      echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     3.1 --- a/gst-gmyth/debian/control	Tue Sep 18 18:19:39 2007 +0100
     3.2 +++ b/gst-gmyth/debian/control	Tue Sep 18 18:20:50 2007 +0100
     3.3 @@ -4,6 +4,7 @@
     3.4  Maintainer: Renato Araujo Oliveira Filho  <renato.filho@indt.org.br>
     3.5  Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), autotools-dev, pkg-config (>= 0.11.0), libgstreamer0.10-dev (>= 0.10.0), gmyth-dev (>= 0.3)
     3.6  Standards-Version: 3.6.2
     3.7 +Section: user/library
     3.8  
     3.9  Package: gstreamer0.10-indt-nuvdemux
    3.10  Architecture: any
     4.1 --- a/gst-gmyth/mythsrc/Makefile.am	Tue Sep 18 18:19:39 2007 +0100
     4.2 +++ b/gst-gmyth/mythsrc/Makefile.am	Tue Sep 18 18:20:50 2007 +0100
     4.3 @@ -22,8 +22,6 @@
     4.4  gstmythtvsrc.c: gstmythtvsrc.h
     4.5  	cvs -d:pserver:anoncvs@anoncvs.freedesktop.org:/cvs/gstreamer/ co gst-plugins-bad/ext/mythtv/gstmythtvsrc.c
     4.6  	mv gst-plugins-bad/ext/mythtv/gstmythtvsrc.c .
     4.7 -
     4.8 -gstmythtvsrc.h:
     4.9  	cvs -d:pserver:anoncvs@anoncvs.freedesktop.org:/cvs/gstreamer/ co gst-plugins-bad/ext/mythtv/gstmythtvsrc.h
    4.10  	mv gst-plugins-bad/ext/mythtv/gstmythtvsrc.h .
    4.11  
     5.1 --- a/gst-gmyth/playbinmaemo/gstplaybinmaemo.c	Tue Sep 18 18:19:39 2007 +0100
     5.2 +++ b/gst-gmyth/playbinmaemo/gstplaybinmaemo.c	Tue Sep 18 18:20:50 2007 +0100
     5.3 @@ -74,7 +74,7 @@
     5.4                                                       const GstCaps *caps);
     5.5  static GstPad   *find_sink_pad                      (GstElement * element);
     5.6  static void     update_volume                       (GstPlayBinMaemo *pbm,
     5.7 -                                                     gfloat volume);
     5.8 +                                                     gdouble volume);
     5.9  static void     update_xid                          (GstPlayBinMaemo *pbm);
    5.10  static void     new_decoded_pad_cb                  (GstElement *object,
    5.11                                                       GstPad* pad,
    5.12 @@ -87,9 +87,11 @@
    5.13                                                       GstPad *pad,
    5.14                                                       GstCaps *casp,
    5.15                                                       gpointer user_data);
    5.16 +#if 0
    5.17  static gboolean autoplug_continue_cb                (GstElement* object,
    5.18                                                       GstCaps* caps,
    5.19                                                       gpointer user_data);
    5.20 +#endif 
    5.21  static gboolean add_element                         (GstPlayBinMaemo *pbm,
    5.22                                                       GstElement *child);
    5.23  static void     clear_elements                      (GstPlayBinMaemo *pbm);
    5.24 @@ -182,6 +184,7 @@
    5.25    play_bin_maemo = GST_PLAY_BIN_MAEMO (object);
    5.26    g_free (play_bin_maemo->uri);
    5.27    play_bin_maemo->uri = NULL;
    5.28 +  clear_elements (GST_PLAY_BIN_MAEMO (object));
    5.29  
    5.30    G_OBJECT_CLASS (parent_class)->dispose (object);
    5.31  }
    5.32 @@ -189,7 +192,6 @@
    5.33  static void
    5.34  gst_play_bin_maemo_finalize (GObject * object)
    5.35  {
    5.36 -  clear_elements (GST_PLAY_BIN_MAEMO (object));
    5.37    G_OBJECT_CLASS (parent_class)->finalize (object);
    5.38  }
    5.39  
    5.40 @@ -312,17 +314,62 @@
    5.41  }
    5.42  
    5.43  static void
    5.44 +_setup_decoder (GstPlayBinMaemo *pbm, GstElement *element)
    5.45 +{
    5.46 +  GList *factories;
    5.47 +  GstCaps *all_caps;
    5.48 +  //GstCaps *decode_caps;
    5.49 +
    5.50 +
    5.51 +//  all_caps = gst_caps_new_empty ();
    5.52 +  g_object_get (element, "caps", &all_caps, NULL);
    5.53 +  all_caps = gst_caps_copy (all_caps);
    5.54 +//  gst_caps_append (all_caps, decode_caps);
    5.55 +
    5.56 +  /* loop over all the factories */
    5.57 +  for (factories = pbm->factories; factories; factories = g_list_next (factories)) {
    5.58 +    GstElementFactory *factory = GST_ELEMENT_FACTORY (factories->data);
    5.59 +    const GList *templates;
    5.60 +    GList *walk;
    5.61 +
    5.62 +    /* get the templates from the element factory */
    5.63 +    templates = gst_element_factory_get_static_pad_templates (factory);
    5.64 +    for (walk = (GList *) templates; walk; walk = g_list_next (walk)) {
    5.65 +      GstStaticPadTemplate *templ = walk->data;
    5.66 +
    5.67 +      /* we only care about the sink templates */
    5.68 +      if (templ->direction == GST_PAD_SINK) {
    5.69 +        GstCaps *tmpl_caps;
    5.70 +
    5.71 +        /* try to intersect the caps with the caps of the template */
    5.72 +        tmpl_caps = gst_static_caps_get (&templ->static_caps);
    5.73 +        gst_caps_append (all_caps, gst_caps_copy (tmpl_caps));
    5.74 +        gst_caps_ref (tmpl_caps);
    5.75 +      }
    5.76 +    }
    5.77 +  }
    5.78 +
    5.79 +  g_object_set (element, "caps", all_caps, NULL);
    5.80 +}
    5.81 +
    5.82 +static void
    5.83  prepare_elements (GstPlayBinMaemo *pbm)
    5.84  {
    5.85    GstElement *decoder;
    5.86    GstElement *queue;
    5.87  
    5.88 +  queue = gst_element_factory_make ("queue", NULL);
    5.89 +  add_element (pbm, queue);
    5.90 +
    5.91    decoder = gst_element_factory_make ("decodebin2", "decode");
    5.92 +  _setup_decoder (pbm, decoder);
    5.93    add_element (pbm, decoder);
    5.94 +  /*
    5.95    g_signal_connect (G_OBJECT (decoder),
    5.96                      "autoplug-continue",
    5.97                      G_CALLBACK (autoplug_continue_cb),
    5.98                      pbm);
    5.99 +                    */
   5.100  
   5.101    g_signal_connect (G_OBJECT (decoder),
   5.102                      "unknown-type",
   5.103 @@ -340,9 +387,6 @@
   5.104                      pbm);
   5.105  
   5.106  
   5.107 -  queue = gst_element_factory_make ("queue", NULL);
   5.108 -  add_element (pbm, queue);
   5.109 -
   5.110    if (gst_element_link_many (pbm->source, queue, decoder, NULL) == FALSE) {
   5.111      GST_WARNING ("FAIL TO LINK SRC WITH DECODEBIN2");
   5.112    }
   5.113 @@ -609,6 +653,7 @@
   5.114    return to_try;
   5.115  }
   5.116  
   5.117 +#if 0
   5.118  static gboolean
   5.119  autoplug_continue_cb (GstElement* object,
   5.120                        GstCaps* caps,
   5.121 @@ -641,6 +686,7 @@
   5.122  
   5.123      return ret;
   5.124  }
   5.125 +#endif
   5.126  
   5.127  static void
   5.128  unknown_type_cb (GstElement *object,
   5.129 @@ -717,7 +763,7 @@
   5.130  
   5.131    } else if (strstr (gst_element_factory_get_klass (factory), "Sink/Audio") != NULL) {
   5.132      GParamSpec *vol_spec;
   5.133 -    GstElement *prev;
   5.134 +    GstElement *prev = NULL;
   5.135  
   5.136      prev = queue;
   5.137      vol_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume");
   5.138 @@ -747,8 +793,6 @@
   5.139        }
   5.140  
   5.141        prev = volume;
   5.142 -    } else {
   5.143 -      g_param_spec_unref (vol_spec);
   5.144      }
   5.145  
   5.146      gst_bin_add (GST_BIN (bin), element);
   5.147 @@ -768,6 +812,7 @@
   5.148    gst_element_add_pad (bin, gst_ghost_pad_new ("sink", pad));
   5.149    gst_object_unref (pad);
   5.150  
   5.151 +
   5.152    return bin;
   5.153  
   5.154  error:
   5.155 @@ -810,7 +855,7 @@
   5.156      GstElementFactory *factory = (GstElementFactory *) walk->data;
   5.157      GstElement *element;
   5.158      GstPad *sinkpad = NULL;
   5.159 -    gint result;
   5.160 +
   5.161  
   5.162      if ((element = create_element (pbm, factory)) == NULL) {
   5.163        GST_WARNING_OBJECT (pbm, "Could not create an element from %s",
   5.164 @@ -861,7 +906,6 @@
   5.165  
   5.166    g_list_free (comp);
   5.167    if (linked == FALSE) {
   5.168 -    g_debug ("GstFlow Error");
   5.169      GST_WARNING ("GstFlow ERROR");
   5.170    }
   5.171    GST_PAD_STREAM_UNLOCK (pad);
   5.172 @@ -935,7 +979,7 @@
   5.173  }
   5.174  
   5.175  static void
   5.176 -update_volume (GstPlayBinMaemo *pbm, gfloat volume)
   5.177 +update_volume (GstPlayBinMaemo *pbm, gdouble volume)
   5.178  {
   5.179    pbm->volume = volume;
   5.180    if (pbm->volume_element) {
     6.1 --- a/gst-gmyth/playbinmaemo/gstplaybinmaemo.h	Tue Sep 18 18:19:39 2007 +0100
     6.2 +++ b/gst-gmyth/playbinmaemo/gstplaybinmaemo.h	Tue Sep 18 18:20:50 2007 +0100
     6.3 @@ -48,7 +48,7 @@
     6.4    gboolean       is_stream;
     6.5    gboolean       parse_metadata;
     6.6    glong          xid;
     6.7 -  gfloat         volume;
     6.8 +  gdouble        volume;
     6.9  
    6.10    /* currently loaded media */
    6.11    gboolean      need_rebuild;
     7.1 --- a/libgnomevfs2-mythtv/debian/changelog	Tue Sep 18 18:19:39 2007 +0100
     7.2 +++ b/libgnomevfs2-mythtv/debian/changelog	Tue Sep 18 18:20:50 2007 +0100
     7.3 @@ -1,4 +1,4 @@
     7.4 -libgnomevfs2-mythtv (0.3) unstable; urgency=low
     7.5 +libgnomevfs2-mythtv (0.3-indt1) unstable; urgency=low
     7.6  
     7.7    * Some bugs fixed
     7.8    * Livetv improved
     8.1 --- a/libgnomevfs2-mythtv/debian/control	Tue Sep 18 18:19:39 2007 +0100
     8.2 +++ b/libgnomevfs2-mythtv/debian/control	Tue Sep 18 18:20:50 2007 +0100
     8.3 @@ -3,6 +3,7 @@
     8.4  Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
     8.5  Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libglib2.0-dev, gmyth-dev (>= 0.3)
     8.6  Standards-Version: 3.6.1
     8.7 +Section: user/library
     8.8  
     8.9  Package: libgnomevfs2-mythtv
    8.10  Section: user/library