Home | History | Annotate | Download | only in patches
      1  15260  elaine --- ./src/cheese-webcam.c.orig	2008-09-01 11:16:01.916287000 +0800
      2  15260  elaine +++ ./src/cheese-webcam.c	2008-09-01 11:17:05.996507000 +0800
      3  15260  elaine @@ -620,8 +620,13 @@
      4  15260  elaine      }
      5  15260  elaine    }
      6  15260  elaine      
      7  15260  elaine +#ifdef SOLARIS    
      8  15260  elaine +  *numerator = 15;
      9  15260  elaine +  *denominator = 2;
     10  15260  elaine +#else  
     11  15260  elaine    *numerator = framerate_numerator;
     12  15260  elaine    *denominator = framerate_denominator;
     13  15260  elaine +#endif  
     14  15260  elaine  }
     15  15260  elaine  
     16  15260  elaine  static gboolean 
     17  15260  elaine @@ -956,7 +961,7 @@
     18  15260  elaine      return FALSE;
     19  15260  elaine  
     20  15260  elaine    gst_bin_add_many (GST_BIN (priv->video_save_bin), priv->audio_source, audio_queue,
     21  15260  elaine -                    audio_convert, audio_enc, video_save_csp, video_save_rate, video_save_scale, video_enc, 
     22  15260  elaine +                    audio_convert, audio_enc, video_save_csp, video_save_scale, video_enc, 
     23  15260  elaine                      mux, priv->video_file_sink, NULL);
     24  15260  elaine  
     25  15260  elaine    /* add ghostpad */
     26  15260  elaine @@ -968,7 +973,7 @@
     27  15260  elaine    ok = gst_element_link_many (priv->audio_source, audio_queue, audio_convert, 
     28  15260  elaine                                audio_enc, mux, priv->video_file_sink, NULL);
     29  15260  elaine  
     30  15260  elaine -  ok &= gst_element_link_many (video_save_csp, video_save_rate, video_save_scale, video_enc,
     31  15260  elaine +  ok &= gst_element_link_many (video_save_csp, video_save_scale, video_enc,
     32  15260  elaine                                 NULL);
     33  15260  elaine    ok &= gst_element_link (video_enc, mux);
     34  15260  elaine  
     35  15260  elaine --- ./src/cheese-gconf.c.orig	2008-08-19 02:32:53.000000000 +0800
     36  15260  elaine +++ ./src/cheese-gconf.c	2008-09-01 11:17:05.997071000 +0800
     37  15260  elaine @@ -103,14 +103,18 @@
     38  15260  elaine        g_slist_free (tmp);
     39  15260  elaine        break;
     40  15260  elaine      case GCONF_PROP_X_RESOLUTION:
     41  15260  elaine +      gdk_threads_enter();
     42  15260  elaine        g_value_set_int (value, gconf_client_get_int (priv->client,
     43  15260  elaine                                                      CHEESE_GCONF_PREFIX "/x_resolution",
     44  15260  elaine                                                      NULL));
     45  15260  elaine +      gdk_threads_leave();                                              
     46  15260  elaine        break;
     47  15260  elaine      case GCONF_PROP_Y_RESOLUTION:
     48  15260  elaine +      gdk_threads_enter();
     49  15260  elaine        g_value_set_int (value, gconf_client_get_int (priv->client,
     50  15260  elaine                                                      CHEESE_GCONF_PREFIX "/y_resolution",
     51  15260  elaine                                                      NULL));
     52  15260  elaine +      gdk_threads_leave();                                              
     53  15260  elaine        break;
     54  15260  elaine      case GCONF_PROP_VIDEO_PATH:
     55  15260  elaine        g_value_set_string (value, gconf_client_get_string (priv->client,
     56