Changeset 272

Show
Ignore:
Timestamp:
09/10/05 11:10:23 (3 years ago)
Author:
kickback
Message:

cleaned up most of the compiler warnings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/src/callbacks.c

    r210 r272  
    338338  sw_framecount_t zoom_length; 
    339339 
    340   text = gtk_entry_get_text (GTK_ENTRY(widget)); 
     340  text = (gchar *) gtk_entry_get_text (GTK_ENTRY(widget)); 
    341341 
    342342  if (!strcmp (text, "All")) { 

  • sweep/trunk/src/driver.c

    r216 r272  
    169169    gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(main_combo)->entry)); 
    170170 
    171   prefs_set_string (DEV_KEY, main_dev); 
     171  prefs_set_string (DEV_KEY, (gchar *)main_dev); 
    172172 
    173173  if (monitor_checked (dialog)) { 
    174174    monitor_dev = 
    175175      gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(monitor_combo)->entry));  
    176     prefs_set_string (MONITOR_DEV_KEY, monitor_dev); 
     176    prefs_set_string (MONITOR_DEV_KEY, (gchar *)monitor_dev); 
    177177 
    178178    prefs_set_int (USE_MONITOR_KEY, 1); 
    …… 
    205205 
    206206  if (monitor_checked (dialog)) { 
    207     main_devname = 
     207    main_devname = (gchar *) 
    208208      gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(main_combo)->entry)); 
    209     monitor_devname = 
     209    monitor_devname = (gchar *) 
    210210      gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(monitor_combo)->entry)); 
    211211 
    …… 
    248248{ 
    249249  GtkWidget * dialog = GTK_WIDGET (data); 
    250   char * main_dev, * monitor_dev; 
     250  gchar * main_dev, * monitor_dev; 
    251251 
    252252  main_dev = 
    253253    g_strdup (gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(main_combo)->entry))); 
    254   monitor_dev = gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(monitor_combo)->entry)); 
     254  monitor_dev = (gchar *)gtk_entry_get_text (GTK_ENTRY(GTK_COMBO(monitor_combo)->entry)); 
    255255 
    256256  gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(main_combo)->entry), monitor_dev); 

  • sweep/trunk/src/file_dialogs.c

    r269 r272  
    281281  gchar *dir; 
    282282 
    283   dir = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data)); 
     283  dir = (gchar *)gtk_file_selection_get_filename(GTK_FILE_SELECTION(data)); 
    284284 
    285285  sample_load(dir); 

  • sweep/trunk/src/file_speex.c

    r222 r272  
    690690{ 
    691691  sw_sample * sample = inst->sample; 
    692   char * pathname = (char *)inst->do_data; 
     692  gchar * pathname = (gchar *)inst->do_data; 
    693693 
    694694  FILE * outfile; 
    …… 
    707707 
    708708  float input[MAX_FRAME_SIZE]; 
    709   char cbits[MAX_FRAME_BYTES]; 
     709  gchar cbits[MAX_FRAME_BYTES]; 
    710710  int nbBytes; 
    711711  int id = 0; 
    …… 
    717717  SpeexBits bits; 
    718718 
    719   char * vendor_string = "Encoded with Sweep " VERSION " (metadecks.org)"; 
    720   char * comments = NULL; 
     719  gchar * vendor_string = "Encoded with Sweep " VERSION " (metadecks.org)"; 
     720  gchar * comments = NULL; 
    721721  int comments_length = 0; 
    722722 
    …… 
    759759  switch (so->mode) { 
    760760  case MODE_NARROWBAND: 
    761     mode = &speex_nb_mode; 
     761    mode = (SpeexMode *) &speex_nb_mode; 
    762762    break; 
    763763  case MODE_WIDEBAND: 
    764     mode = &speex_wb_mode; 
     764    mode = (SpeexMode *) &speex_wb_mode; 
    765765    break; 
    766766#if (SPEEX_NB_MODES > 2) 
    767767  case MODE_ULTRAWIDEBAND: 
    768     mode = &speex_uwb_mode; 
     768    mode = (SpeexMode *) &speex_uwb_mode; 
    769769    break; 
    770770#endif 
    771771  default: 
    772     mode = &speex_nb_mode; 
     772    mode = (SpeexMode *) &speex_nb_mode; 
    773773    break; 
    774774  } 
    …… 
    10841084  GtkWidget * checkbutton; 
    10851085  GtkWidget * entry; 
    1086   gchar * text; 
     1086  const gchar * text; 
    10871087 
    10881088  gboolean use_br; 

  • sweep/trunk/src/file_vorbis.c

    r223 r272  
    715715  GtkWidget * checkbutton; 
    716716  GtkWidget * entry; 
    717   gchar * text; 
     717  const gchar * text; 
    718718 
    719719  gboolean use_abr; 

  • sweep/trunk/src/plugin.c

    r260 r272  
    5353  GModule * module; 
    5454  sw_plugin * m_plugin; 
     55  gpointer  m_plugin_ptr; 
    5556  GList * gl; 
    5657 
    …… 
    6566  } 
    6667   
    67   if (g_module_symbol (module, "plugin", (gpointer *)&m_plugin)) { 
     68  if (g_module_symbol (module, "plugin", &m_plugin_ptr)) { 
     69        m_plugin = (sw_plugin *)m_plugin_ptr; 
    6870    for (gl = m_plugin->plugin_init (); gl; gl = gl->next) { 
    6971      plugins = g_list_insert_sorted (plugins, (sw_procedure *)gl->data, 

  • sweep/trunk/src/question_dialogs.c

    r269 r272  
    247247  char * new_message; 
    248248 
    249   sys_errstr = g_strerror (pd->thread_errno); 
     249  sys_errstr = (gchar *) g_strerror (pd->thread_errno); 
    250250 
    251251  if (sys_errstr != NULL) { 

  • sweep/trunk/src/record.c

    r269 r272  
    335335 
    336336  head = sample->rec_head; 
    337 #warning check return code for successful disconnect here. 
     337 
    338338  if (rec_head != NULL) { 
    339339    g_signal_handlers_disconnect_matched 
    …… 
    388388{ 
    389389  GtkEntry * entry; 
    390   gchar * new_text; 
     390  const gchar * new_text; 
    391391  sw_sample * sample; 
    392392 

  • sweep/trunk/src/sweep_sample.c

    r269 r272  
    182182  s->color = ((int)random()) % VIEW_COLOR_MAX; 
    183183#else 
    184   s->color = filename_color_hash (g_basename (s->pathname)); 
     184  s->color = filename_color_hash ((gchar *)g_basename (s->pathname)); 
    185185#endif 
    186186 
    …… 
    242242 
    243243  entry = g_object_get_data (G_OBJECT(dialog), "name_entry"); 
    244   filename = gtk_entry_get_text (GTK_ENTRY(entry)); 
     244  filename = (gchar *) gtk_entry_get_text (GTK_ENTRY(entry)); 
    245245 
    246246  entry = g_object_get_data (G_OBJECT(dialog), "duration_entry"); 
    247   text = gtk_entry_get_text (GTK_ENTRY(entry)); 
     247  text = (gchar *) gtk_entry_get_text (GTK_ENTRY(entry)); 
    248248  seconds = strtime_to_seconds (text); 
    249249  if (seconds == -1) goto out; /* XXX: invalid time spec */ 
    …… 
    267267  } 
    268268 
    269   s = sample_new_empty (filename, nr_channels, sample_rate, nr_frames); 
     269  s = sample_new_empty ((gchar *)filename, nr_channels, sample_rate, nr_frames); 
    270270  v = view_new_all (s, 1.0); 
    271271  sample_add_view (s, v); 
    …… 
    309309 
    310310  entry = g_object_get_data (G_OBJECT(dialog), "duration_entry"); 
    311   text = gtk_entry_get_text (GTK_ENTRY(entry)); 
     311  text = (gchar *)gtk_entry_get_text (GTK_ENTRY(entry)); 
    312312  seconds = strtime_to_seconds (text); 
    313313 
    …… 
    705705    s = (sw_sample *)gl->data; 
    706706 
    707     ret = g_list_append (ret, g_basename (s->pathname)); 
     707    ret = g_list_append (ret, (gpointer *)g_basename (s->pathname)); 
    708708  } 
    709709 

  • sweep/trunk/src/undo_dialog.c

    r248 r272  
    222222 
    223223  entry = GTK_ENTRY(GTK_COMBO(combo)->entry); 
    224   new_text = gtk_entry_get_text (entry); 
     224  new_text = (gchar *)gtk_entry_get_text (entry); 
    225225 
    226226  sample = sample_bank_find_byname (new_text);