This was pretty trivial on my box actually; just had to add a string.h
in one file and change the GTK menu cast in 3 others. I called the
cast "GTK_MENU_CAST" and it should be set to either void(*)(...) for
the older GCC or void(*)() for the new (forbidden!?) gcc 2.96. I am
assuming this will go into config.h... I did not add a check for the
GCC version.
Here is a context diff. Kinda noisy. If there are any questions
about it, let me know.
Thanks!
Mark
diff -c -r freeamp/base/src/database.cpp freeamp.new/base/src/database.cpp
*** freeamp/base/src/database.cpp Thu Aug 24 11:40:38 2000
--- freeamp.new/base/src/database.cpp Sun Oct 8 13:57:10 2000
***************
*** 26,31 ****
--- 26,32 ----
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
+ #include <string.h>
#include "gdbm_fa.h"
#include "errors.h"
diff -c -r freeamp/ui/musicbrowser/unix/src/browserlist.cpp
freeamp.new/ui/musicbrowser/unix/src/browserlist.cpp
*** freeamp/ui/musicbrowser/unix/src/browserlist.cpp Wed Oct 4 16:49:39 2000
--- freeamp.new/ui/musicbrowser/unix/src/browserlist.cpp Sun Oct 8 14:35:46
2000
***************
*** 1053,1081 ****
void GTKMusicBrowser::CreatePlaylistList(GtkWidget *box)
{
GtkItemFactoryEntry popup_items[] = {
! {"/Play Now", NULL, (void(*)(...))play_now_pop, 0, 0 },
! {"/Move Up", NULL, (void(*)(...))move_up_pop, 0, 0 },
! {"/Move Down", NULL, (void(*)(...))move_down_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (void(*)(...))delete_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (void(*)(...))edit_pop, 0, 0 },
{"/sep3", NULL, 0, 0, "<Separator>" },
! {"/Tip This Artist", NULL, (void(*)(...))tip_pop, 0, 0 }
};
int nmenu_items = sizeof(popup_items) / sizeof(popup_items[0]);
GtkItemFactoryEntry popup2_items[] = {
! {"/Play Now", NULL, (void(*)(...))play_now_pop, 0, 0 },
! {"/Move Up", NULL, (void(*)(...))move_up_pop, 0, 0 },
! {"/Move Down", NULL, (void(*)(...))move_down_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (void(*)(...))delete_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (void(*)(...))edit_pop, 0, 0 },
{"/sep3", NULL, 0, 0, "<Separator>" },
! {"/Add Stream to Favorites", NULL, (void(*)(...))add_fav_pop, 0, 0 }
};
int nmenu2_items = sizeof(popup2_items) / sizeof(popup2_items[0]);
--- 1053,1081 ----
void GTKMusicBrowser::CreatePlaylistList(GtkWidget *box)
{
GtkItemFactoryEntry popup_items[] = {
! {"/Play Now", NULL, (GTK_MENU_CAST)play_now_pop, 0, 0 },
! {"/Move Up", NULL, (GTK_MENU_CAST)move_up_pop, 0, 0 },
! {"/Move Down", NULL, (GTK_MENU_CAST)move_down_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (GTK_MENU_CAST)delete_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (GTK_MENU_CAST)edit_pop, 0, 0 },
{"/sep3", NULL, 0, 0, "<Separator>" },
! {"/Tip This Artist", NULL, (GTK_MENU_CAST)tip_pop, 0, 0 }
};
int nmenu_items = sizeof(popup_items) / sizeof(popup_items[0]);
GtkItemFactoryEntry popup2_items[] = {
! {"/Play Now", NULL, (GTK_MENU_CAST)play_now_pop, 0, 0 },
! {"/Move Up", NULL, (GTK_MENU_CAST)move_up_pop, 0, 0 },
! {"/Move Down", NULL, (GTK_MENU_CAST)move_down_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (GTK_MENU_CAST)delete_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (GTK_MENU_CAST)edit_pop, 0, 0 },
{"/sep3", NULL, 0, 0, "<Separator>" },
! {"/Add Stream to Favorites", NULL, (GTK_MENU_CAST)add_fav_pop, 0, 0 }
};
int nmenu2_items = sizeof(popup2_items) / sizeof(popup2_items[0]);
diff -c -r freeamp/ui/musicbrowser/unix/src/browsermenu.cpp
freeamp.new/ui/musicbrowser/unix/src/browsermenu.cpp
*** freeamp/ui/musicbrowser/unix/src/browsermenu.cpp Thu Oct 5 05:47:33 2000
--- freeamp.new/ui/musicbrowser/unix/src/browsermenu.cpp Sun Oct 8 14:22:21
2000
***************
*** 570,650 ****
{
GtkItemFactoryEntry menu_items[] = {
{"/_File", NULL, 0, 0, "<Branch>" },
! {"/File/_New Playlist", "<control>N", (void(*)(...))new_plist, 0, 0 },
! {"/File/_Open Playlist", "<control>O", (void(*)(...))open_list, 0, 0 },
! {"/File/_Save Playlist", "<control>S", (void(*)(...))save_list, 0, 0 },
! {"/File/Save Playlist _As","<control>A", (void(*)(...))saveas_list,0, 0 },
{"/File/sep1", NULL, 0, 0, "<Separator>" },
! {"/File/_Import Tracks and Playlists","<control>I", (void(*)(...))import_list,
0, 0 },
! {"/File/_Export Playlist", NULL, (void(*)(...))export_list, 0, 0 },
{"/File/sep0", NULL, 0, 0, "<Separator>" },
! {"/File/Create New Audio CD", NULL, (void(*)(...))create_cd, 0, 0 },
! {"/File/Search Computer for Music", NULL, (void(*)(...))music_search, 0, 0 },
{"/File/sep2", NULL, 0, 0, "<Separator>" },
! {"/File/_Close", "<control>Q", (void(*)(...))quit_menu, 0, 0 },
{"/_Edit", NULL, 0, 0, "<Branch>" },
! {"/_Edit/_Add Items to Playlist", NULL, (void(*)(...))add_track_mb, 0, 0 },
! {"/_Edit/Add _Tracks or Playlists from Disk", NULL, (void(*)(...))add_track,
0, 0 },
! {"/_Edit/_Remove Items from My Music", NULL,(void(*)(...))delete_sel,0, 0 },
! {"/_Edit/Add Stream to Favorites", NULL, (void(*)(...))add_stream, 0, 0 },
{"/_Edit/sep3", NULL, 0, 0, "<Separator>" },
! {"/_Edit/Move _Up", NULL, (void(*)(...))move_up, 0, 0 },
! {"/_Edit/Move _Down", NULL, (void(*)(...))move_down, 0, 0 },
{"/_Edit/sep4", NULL, 0, 0, "<Separator>" },
! {"/_Edit/_Clear Playlist", NULL, (void(*)(...))clear_list, 0, 0 },
! {"/_Edit/Edit _Info", NULL, (void(*)(...))infoedit, 0, 0 },
{"/_View", NULL, 0, 0, "<Branch>" },
! {"/_View/View _Playlist Only",NULL, (void(*)(...))catalog_tog, 0, 0 },
! {"/_View/_Options", NULL, (void(*)(...))options_show, 0, 0 },
{"/_Controls", NULL, 0, 0, "<Branch>" },
! {"/_Controls/_Play", NULL, (void(*)(...))play_menu,0, 0 },
! {"/_Controls/_Stop", NULL, (void(*)(...))stop_menu, 0, 0 },
{"/_Controls/sep6", NULL, 0, 0, "<Separator>" },
! {"/_Controls/_Eject CD", NULL, (void(*)(...))eject_cd, 0, 0 },
{"/_Controls/sep65", NULL, 0, 0, "<Separator>" },
! {"/_Controls/_Next Track", NULL, (void(*)(...))next_menu, 0, 0 },
! {"/_Controls/Pre_vious Track", NULL, (void(*)(...))prev_menu, 0, 0 },
{"/_Controls/sep7", NULL, 0, 0, "<Separator>" },
! {"/_Controls/Play Tracks in Nor_mal Order", NULL, (void(*)(...))sort_normal, 0,
"<RadioItem>" },
! {"/_Controls/Play Tracks in _Random Order", NULL, (void(*)(...))sort_random2,
0, "/Controls/Play Tracks in Normal Order" },
{"/_Controls/sep8", NULL, 0, 0, "<Separator>" },
! {"/_Controls/Repeat N_o Tracks", NULL, (void(*)(...))repeat_none, 0,
"<RadioItem>" },
! {"/_Controls/Repeat _Current Track", NULL, (void(*)(...))repeat_one, 0,
"/Controls/Repeat No Tracks" },
! {"/_Controls/Repeat _All Tracks", NULL, (void(*)(...))repeat_all, 0,
"/Controls/Repeat No Tracks" },
{"/_Sort Playlist", NULL, 0, 0, "<Branch>" },
! {"/_Sort Playlist/by _Artist", NULL, (void(*)(...))sort_artist, 0, 0 },
! {"/_Sort Playlist/by A_lbum", NULL, (void(*)(...))sort_album, 0, 0 },
! {"/_Sort Playlist/by _Title", NULL, (void(*)(...))sort_title, 0, 0 },
! {"/_Sort Playlist/by _Year", NULL, (void(*)(...))sort_year, 0, 0 },
! {"/_Sort Playlist/by Trac_k Number", NULL, (void(*)(...))sort_track, 0, 0 },
! {"/_Sort Playlist/by _Genre", NULL, (void(*)(...))sort_genre, 0, 0 },
! {"/_Sort Playlist/by _Length", NULL, (void(*)(...))sort_time, 0, 0 },
! {"/_Sort Playlist/by L_ocation", NULL, (void(*)(...))sort_location, 0, 0 },
! {"/_Sort Playlist/by _Filename", NULL, (void(*)(...))sort_filename, 0, 0 },
! {"/_Sort Playlist/by _Comment", NULL, (void(*)(...))sort_comment, 0, 0},
! {"/_Sort Playlist/_Randomly", NULL, (void(*)(...))sort_random, 0, 0 },
{"/_Relatable", NULL, 0, 0, "<Branch>" },
! {"/_Relatable/_Recommend Playlist", NULL, (void(*)(...))genplaylist, 0, 0 },
! {"/_Relatable/SoundsLike Recommendation", NULL,
(void(*)(...))genslplaylistnomax, 0, 0 },
! {"/_Relatable/_Learn Playlist", NULL, (void(*)(...))submitplaylist, 0, 0 },
{"/_Relatable/sep", NULL, 0, 0, "<Separator>" },
! {"/_Relatable/_Start Signaturing", NULL, (void(*)(...))signature_func, 0, 0 },
{"/_Relatable/sep2", NULL, 0, 0, "<Separator>" },
! {"/_Relatable/_Edit Profile", NULL, (void(*)(...))profile_edit, 0, 0 },
{"/_Help", NULL, 0, 0, "<Branch>" },
! {"/_Help/_Contents", NULL, (void(*)(...))show_help, 0, 0 },
{"/_Help/sep9", NULL, 0, 0, "<Separator>" },
! {"/_Help/_FreeAmp Web Site", NULL, (void(*)(...))freeamp_web, 0, 0 },
! {"/_Help/_EMusic.com Web Site", NULL, (void(*)(...))emusic_web, 0, 0 },
! {"/_Help/_Relatable Web Site", NULL, (void(*)(...))relatable_web, 0, 0 },
{"/_Help/sep10", NULL, 0, 0, "<Separator>" },
! {"/_Help/_About", NULL, (void(*)(...))show_about, 0, 0 }
};
int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
--- 570,650 ----
{
GtkItemFactoryEntry menu_items[] = {
{"/_File", NULL, 0, 0, "<Branch>" },
! {"/File/_New Playlist", "<control>N", (GTK_MENU_CAST)new_plist, 0, 0 },
! {"/File/_Open Playlist", "<control>O", (GTK_MENU_CAST)open_list, 0, 0 },
! {"/File/_Save Playlist", "<control>S", (GTK_MENU_CAST)save_list, 0, 0 },
! {"/File/Save Playlist _As","<control>A", (GTK_MENU_CAST)saveas_list,0, 0 },
{"/File/sep1", NULL, 0, 0, "<Separator>" },
! {"/File/_Import Tracks and Playlists","<control>I", (GTK_MENU_CAST)import_list,
0, 0 },
! {"/File/_Export Playlist", NULL, (GTK_MENU_CAST)export_list, 0, 0 },
{"/File/sep0", NULL, 0, 0, "<Separator>" },
! {"/File/Create New Audio CD", NULL, (GTK_MENU_CAST)create_cd, 0, 0 },
! {"/File/Search Computer for Music", NULL, (GTK_MENU_CAST)music_search, 0, 0 },
{"/File/sep2", NULL, 0, 0, "<Separator>" },
! {"/File/_Close", "<control>Q", (GTK_MENU_CAST)quit_menu, 0, 0 },
{"/_Edit", NULL, 0, 0, "<Branch>" },
! {"/_Edit/_Add Items to Playlist", NULL, (GTK_MENU_CAST)add_track_mb, 0, 0 },
! {"/_Edit/Add _Tracks or Playlists from Disk", NULL, (GTK_MENU_CAST)add_track,
0, 0 },
! {"/_Edit/_Remove Items from My Music", NULL,(GTK_MENU_CAST)delete_sel,0, 0 },
! {"/_Edit/Add Stream to Favorites", NULL, (GTK_MENU_CAST)add_stream, 0, 0 },
{"/_Edit/sep3", NULL, 0, 0, "<Separator>" },
! {"/_Edit/Move _Up", NULL, (GTK_MENU_CAST)move_up, 0, 0 },
! {"/_Edit/Move _Down", NULL, (GTK_MENU_CAST)move_down, 0, 0 },
{"/_Edit/sep4", NULL, 0, 0, "<Separator>" },
! {"/_Edit/_Clear Playlist", NULL, (GTK_MENU_CAST)clear_list, 0, 0 },
! {"/_Edit/Edit _Info", NULL, (GTK_MENU_CAST)infoedit, 0, 0 },
{"/_View", NULL, 0, 0, "<Branch>" },
! {"/_View/View _Playlist Only",NULL, (GTK_MENU_CAST)catalog_tog, 0, 0 },
! {"/_View/_Options", NULL, (GTK_MENU_CAST)options_show, 0, 0 },
{"/_Controls", NULL, 0, 0, "<Branch>" },
! {"/_Controls/_Play", NULL, (GTK_MENU_CAST)play_menu,0, 0 },
! {"/_Controls/_Stop", NULL, (GTK_MENU_CAST)stop_menu, 0, 0 },
{"/_Controls/sep6", NULL, 0, 0, "<Separator>" },
! {"/_Controls/_Eject CD", NULL, (GTK_MENU_CAST)eject_cd, 0, 0 },
{"/_Controls/sep65", NULL, 0, 0, "<Separator>" },
! {"/_Controls/_Next Track", NULL, (GTK_MENU_CAST)next_menu, 0, 0 },
! {"/_Controls/Pre_vious Track", NULL, (GTK_MENU_CAST)prev_menu, 0, 0 },
{"/_Controls/sep7", NULL, 0, 0, "<Separator>" },
! {"/_Controls/Play Tracks in Nor_mal Order", NULL, (GTK_MENU_CAST)sort_normal,
0, "<RadioItem>" },
! {"/_Controls/Play Tracks in _Random Order", NULL, (GTK_MENU_CAST)sort_random2,
0, "/Controls/Play Tracks in Normal Order" },
{"/_Controls/sep8", NULL, 0, 0, "<Separator>" },
! {"/_Controls/Repeat N_o Tracks", NULL, (GTK_MENU_CAST)repeat_none, 0,
"<RadioItem>" },
! {"/_Controls/Repeat _Current Track", NULL, (GTK_MENU_CAST)repeat_one, 0,
"/Controls/Repeat No Tracks" },
! {"/_Controls/Repeat _All Tracks", NULL, (GTK_MENU_CAST)repeat_all, 0,
"/Controls/Repeat No Tracks" },
{"/_Sort Playlist", NULL, 0, 0, "<Branch>" },
! {"/_Sort Playlist/by _Artist", NULL, (GTK_MENU_CAST)sort_artist, 0, 0 },
! {"/_Sort Playlist/by A_lbum", NULL, (GTK_MENU_CAST)sort_album, 0, 0 },
! {"/_Sort Playlist/by _Title", NULL, (GTK_MENU_CAST)sort_title, 0, 0 },
! {"/_Sort Playlist/by _Year", NULL, (GTK_MENU_CAST)sort_year, 0, 0 },
! {"/_Sort Playlist/by Trac_k Number", NULL, (GTK_MENU_CAST)sort_track, 0, 0 },
! {"/_Sort Playlist/by _Genre", NULL, (GTK_MENU_CAST)sort_genre, 0, 0 },
! {"/_Sort Playlist/by _Length", NULL, (GTK_MENU_CAST)sort_time, 0, 0 },
! {"/_Sort Playlist/by L_ocation", NULL, (GTK_MENU_CAST)sort_location, 0, 0 },
! {"/_Sort Playlist/by _Filename", NULL, (GTK_MENU_CAST)sort_filename, 0, 0 },
! {"/_Sort Playlist/by _Comment", NULL, (GTK_MENU_CAST)sort_comment, 0, 0},
! {"/_Sort Playlist/_Randomly", NULL, (GTK_MENU_CAST)sort_random, 0, 0 },
{"/_Relatable", NULL, 0, 0, "<Branch>" },
! {"/_Relatable/_Recommend Playlist", NULL, (GTK_MENU_CAST)genplaylist, 0, 0 },
! {"/_Relatable/SoundsLike Recommendation", NULL,
(GTK_MENU_CAST)genslplaylistnomax, 0, 0 },
! {"/_Relatable/_Learn Playlist", NULL, (GTK_MENU_CAST)submitplaylist, 0, 0 },
{"/_Relatable/sep", NULL, 0, 0, "<Separator>" },
! {"/_Relatable/_Start Signaturing", NULL, (GTK_MENU_CAST)signature_func, 0, 0 },
{"/_Relatable/sep2", NULL, 0, 0, "<Separator>" },
! {"/_Relatable/_Edit Profile", NULL, (GTK_MENU_CAST)profile_edit, 0, 0 },
{"/_Help", NULL, 0, 0, "<Branch>" },
! {"/_Help/_Contents", NULL, (GTK_MENU_CAST)show_help, 0, 0 },
{"/_Help/sep9", NULL, 0, 0, "<Separator>" },
! {"/_Help/_FreeAmp Web Site", NULL, (GTK_MENU_CAST)freeamp_web, 0, 0 },
! {"/_Help/_EMusic.com Web Site", NULL, (GTK_MENU_CAST)emusic_web, 0, 0 },
! {"/_Help/_Relatable Web Site", NULL, (GTK_MENU_CAST)relatable_web, 0, 0
},
{"/_Help/sep10", NULL, 0, 0, "<Separator>" },
! {"/_Help/_About", NULL, (GTK_MENU_CAST)show_about, 0, 0 }
};
int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
diff -c -r freeamp/ui/musicbrowser/unix/src/browsertree.cpp
freeamp.new/ui/musicbrowser/unix/src/browsertree.cpp
*** freeamp/ui/musicbrowser/unix/src/browsertree.cpp Thu Oct 5 05:47:33 2000
--- freeamp.new/ui/musicbrowser/unix/src/browsertree.cpp Sun Oct 8 14:29:36
2000
***************
*** 1591,1597 ****
void GTKMusicBrowser::CreateTreePopups(void)
{
GtkItemFactoryEntry relatable_items[] = {
! {"/Refresh Recommendations", NULL, (void(*)(...))refresh_pop, 0, 0}
};
int nrstream_items = sizeof(relatable_items) / sizeof(relatable_items[0]);
--- 1591,1597 ----
void GTKMusicBrowser::CreateTreePopups(void)
{
GtkItemFactoryEntry relatable_items[] = {
! {"/Refresh Recommendations", NULL, (GTK_MENU_CAST)refresh_pop, 0, 0}
};
int nrstream_items = sizeof(relatable_items) / sizeof(relatable_items[0]);
***************
*** 1601,1607 ****
relatable_items, (void*)this);
GtkItemFactoryEntry genstream_items[] = {
! {"/Add New Stream", NULL, (void(*)(...))add_stream_pop, 0, 0 }
};
int ngenstream_items = sizeof(genstream_items) / sizeof(genstream_items[0]);
--- 1601,1607 ----
relatable_items, (void*)this);
GtkItemFactoryEntry genstream_items[] = {
! {"/Add New Stream", NULL, (GTK_MENU_CAST)add_stream_pop, 0, 0 }
};
int ngenstream_items = sizeof(genstream_items) / sizeof(genstream_items[0]);
***************
*** 1611,1620 ****
genstream_items, (void*)this);
GtkItemFactoryEntry stream_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Add To Favorites", NULL, (void(*)(...))add_fav_pop, 0, 0 }
};
int nstream_items = sizeof(stream_items) / sizeof(stream_items[0]);
--- 1611,1620 ----
genstream_items, (void*)this);
GtkItemFactoryEntry stream_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Add To Favorites", NULL, (GTK_MENU_CAST)add_fav_pop, 0, 0 }
};
int nstream_items = sizeof(stream_items) / sizeof(stream_items[0]);
***************
*** 1624,1633 ****
(void*)this);
GtkItemFactoryEntry fav_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (void(*)(...))remove_pop, 0, 0 }
};
int nfav_items = sizeof(fav_items) / sizeof(fav_items[0]);
--- 1624,1633 ----
(void*)this);
GtkItemFactoryEntry fav_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (GTK_MENU_CAST)remove_pop, 0, 0 }
};
int nfav_items = sizeof(fav_items) / sizeof(fav_items[0]);
***************
*** 1635,1646 ****
gtk_item_factory_create_items(favPopup, nfav_items, fav_items, (void*)this);
GtkItemFactoryEntry cd_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Eject CD", NULL, (void(*)(...))eject_cd_pop,0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Update CD Info", NULL, (void(*)(...))update_cd_pop, 0, 0 }
};
int ncd_items = sizeof(cd_items) / sizeof(cd_items[0]);
--- 1635,1646 ----
gtk_item_factory_create_items(favPopup, nfav_items, fav_items, (void*)this);
GtkItemFactoryEntry cd_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Eject CD", NULL, (GTK_MENU_CAST)eject_cd_pop,0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Update CD Info", NULL, (GTK_MENU_CAST)update_cd_pop, 0, 0 }
};
int ncd_items = sizeof(cd_items) / sizeof(cd_items[0]);
***************
*** 1648,1659 ****
gtk_item_factory_create_items(cdPopup, ncd_items, cd_items, (void*)this);
GtkItemFactoryEntry plist_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (void(*)(...))remove_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit", NULL, (void(*)(...))edit_info_pop,0, 0 }
};
int nplist_items = sizeof(plist_items) / sizeof(plist_items[0]);
--- 1648,1659 ----
gtk_item_factory_create_items(cdPopup, ncd_items, cd_items, (void*)this);
GtkItemFactoryEntry plist_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (GTK_MENU_CAST)remove_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit", NULL, (GTK_MENU_CAST)edit_info_pop,0, 0 }
};
int nplist_items = sizeof(plist_items) / sizeof(plist_items[0]);
***************
*** 1663,1674 ****
(void*)this);
GtkItemFactoryEntry track_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (void(*)(...))remove_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (void(*)(...))edit_info_pop,0, 0 }
};
int ntrack_items = sizeof(track_items) / sizeof(track_items[0]);
--- 1663,1674 ----
(void*)this);
GtkItemFactoryEntry track_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
{"/sep1", NULL, 0, 0, "<Separator>" },
! {"/Remove", NULL, (GTK_MENU_CAST)remove_pop, 0, 0 },
{"/sep2", NULL, 0, 0, "<Separator>" },
! {"/Edit Info", NULL, (GTK_MENU_CAST)edit_info_pop,0, 0 }
};
int ntrack_items = sizeof(track_items) / sizeof(track_items[0]);
***************
*** 1678,1685 ****
(void*)this);
GtkItemFactoryEntry other_items[] = {
! {"/Add to Playlist",NULL, (void(*)(...))add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (void(*)(...))add_play_pop, 0, 0 },
};
int nother_items = sizeof(other_items) / sizeof(other_items[0]);
--- 1678,1685 ----
(void*)this);
GtkItemFactoryEntry other_items[] = {
! {"/Add to Playlist",NULL, (GTK_MENU_CAST)add_pop, 0, 0 },
! {"/Add and Play Now",NULL, (GTK_MENU_CAST)add_play_pop, 0, 0 },
};
int nother_items = sizeof(other_items) / sizeof(other_items[0]);
_______________________________________________
[EMAIL PROTECTED]
http://www.freeamp.org/mailman/listinfo/freeamp-dev
