diff -ru -x configure cdrdao-1.1.8/configure.in cdrdao-1.1.8.new2/configure.in --- cdrdao-1.1.8/configure.in 2004-02-13 03:04:43.000000000 +0100 +++ cdrdao-1.1.8.new2/configure.in 2004-05-22 15:09:15.934159976 +0200 @@ -204,8 +204,8 @@ en_xdao=yes en_scsilib=yes -PKG_CHECK_MODULES(GTKMM2, gtkmm-2.0 >= 2.2,[],[en_xdao=no]) -PKG_CHECK_MODULES(LIBGUIMM2, libgnomeuimm-2.0 >= 2.0,[],[en_xdao=no]) +PKG_CHECK_MODULES(GTKMM2, gtkmm-2.4 >= 2.4,[],[en_xdao=no]) +PKG_CHECK_MODULES(LIBGUIMM2, libgnomeuimm-2.6 >= 2.6,[],[en_xdao=no]) dnl Determine source for scsi interface class if test "$use_scglib" = default; then diff -ru -x configure cdrdao-1.1.8/xdao/AddFileDialog.cc cdrdao-1.1.8.new2/xdao/AddFileDialog.cc --- cdrdao-1.1.8/xdao/AddFileDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/AddFileDialog.cc 2004-05-22 15:09:15.934159976 +0200 @@ -55,9 +55,8 @@ ok->set_label(Gtk::Stock::ADD.id); ok->set_use_stock(true); - ok->signal_clicked().connect(SigC::slot(*this,&AddFileDialog::applyAction)); - cancel->signal_clicked().connect(SigC::slot(*this, - &AddFileDialog::closeAction)); + ok->signal_clicked().connect(sigc::mem_fun(*this, &AddFileDialog::applyAction)); + cancel->signal_clicked().connect(sigc::mem_fun(*this, &AddFileDialog::closeAction)); } AddFileDialog::~AddFileDialog() diff -ru -x configure cdrdao-1.1.8/xdao/AddSilenceDialog.cc cdrdao-1.1.8.new2/xdao/AddSilenceDialog.cc --- cdrdao-1.1.8/xdao/AddSilenceDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/AddSilenceDialog.cc 2004-05-22 15:09:15.935159824 +0200 @@ -80,15 +80,15 @@ applyButton_ = new Gtk::Button(Gtk::StockID(Gtk::Stock::APPLY)); bbox->pack_start(*applyButton_); - applyButton_->signal_clicked().connect(slot(*this, &AddSilenceDialog::applyAction)); + applyButton_->signal_clicked().connect(mem_fun(*this, &AddSilenceDialog::applyAction)); button = new Gtk::Button(Gtk::StockID(Gtk::Stock::CLEAR)); bbox->pack_start(*button); - button->signal_clicked().connect(slot(*this, &AddSilenceDialog::clearAction)); + button->signal_clicked().connect(mem_fun(*this, &AddSilenceDialog::clearAction)); button = new Gtk::Button(Gtk::StockID(Gtk::Stock::CLOSE)); bbox->pack_start(*button); - button->signal_clicked().connect(slot(*this, &AddSilenceDialog::closeAction)); + button->signal_clicked().connect(mem_fun(*this, &AddSilenceDialog::closeAction)); get_action_area()->pack_start(*bbox); show_all_children(); diff -ru -x configure cdrdao-1.1.8/xdao/AudioCDProject.cc cdrdao-1.1.8.new2/xdao/AudioCDProject.cc --- cdrdao-1.1.8/xdao/AudioCDProject.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/AudioCDProject.cc 2004-05-22 15:10:26.651409320 +0200 @@ -75,7 +75,7 @@ menus.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::PROPERTIES)), _("CD-TEXT..."), - slot(*this, &AudioCDProject::cdTextDialog), + mem_fun(*this, &AudioCDProject::cdTextDialog), _("Edit CD-TEXT data"))); insert_menus(_("Edit/Project Info..."), menus); } @@ -192,7 +192,7 @@ if (playStatus_ == PAUSED) { playStatus_ = PLAYING; - Glib::signal_idle().connect(slot(*this, &AudioCDProject::playCallback)); + Glib::signal_idle().connect(mem_fun(*this, &AudioCDProject::playCallback)); return; } @@ -248,14 +248,14 @@ guiUpdate(level); - Glib::signal_idle().connect(slot(*this, &AudioCDProject::playCallback)); + Glib::signal_idle().connect(mem_fun(*this, &AudioCDProject::playCallback)); } void AudioCDProject::playPause() { if (playStatus_ == PAUSED) { playStatus_ = PLAYING; - Glib::signal_idle().connect(slot(*this, &AudioCDProject::playCallback)); + Glib::signal_idle().connect(mem_fun(*this, &AudioCDProject::playCallback)); } else if (playStatus_ == PLAYING) { playStatus_ = PAUSED; } @@ -346,56 +346,56 @@ std::vector toollist; toollist.push_back(Item(Icon(Gtk::Stock::NEW), _("New"), - slot(*gcdmaster, &GCDMaster::newChooserWindow), + mem_fun(*gcdmaster, &GCDMaster::newChooserWindow), _("New Project"))); toollist.push_back(Item(Icon(Gtk::Stock::OPEN), _("Open"), - bind(slot(*gcdmaster,&GCDMaster::openProject), + bind(mem_fun(*gcdmaster,&GCDMaster::openProject), (ProjectChooser *)0), _("Open a project"))); toollist.push_back(Item(Icon(Gtk::Stock::CLOSE), _("Close"), - bind(slot(*gcdmaster, &GCDMaster::closeProject), + bind(mem_fun(*gcdmaster, &GCDMaster::closeProject), this), _("Close current project"))); toollist.push_back(Item(Icon(Gtk::Stock::SAVE), _("Save"), - slot(*this, &Project::saveProject), + mem_fun(*this, &Project::saveProject), _("Save current project"))); toollist.push_back(Item(Icon(Gtk::Stock::CDROM), _("Record"), - slot(*this, &Project::recordToc2CD), + mem_fun(*this, &Project::recordToc2CD), _("Record to CD"))); toollist.push_back(Separator()); toollist.push_back(Item(Icon(Icons::PLAY), _("Play"), - slot(*this, &AudioCDProject::on_play_clicked), + mem_fun(*this, &AudioCDProject::on_play_clicked), _("Play"))); toollist.push_back(Item(Icon(Icons::STOP), _("Stop"), - slot(*this, &AudioCDProject::on_stop_clicked), + mem_fun(*this, &AudioCDProject::on_stop_clicked), _("Stop"))); toollist.push_back(Item(Icon(Icons::PAUSE), _("Pause"), - slot(*this, &AudioCDProject::on_pause_clicked), + mem_fun(*this, &AudioCDProject::on_pause_clicked), _("Pause"))); toollist.push_back(Separator()); std::vector radiotree; radiotree.push_back(Item(Icon(Gtk::Stock::JUMP_TO), _("Select"), - slot(*this, &AudioCDProject::on_select_clicked), + mem_fun(*this, &AudioCDProject::on_select_clicked), _("Select Mode"))); radiotree.push_back(Item(Icon(Gtk::Stock::ZOOM_FIT), _("Zoom"), - slot(*this, &AudioCDProject::on_zoom_clicked), + mem_fun(*this, &AudioCDProject::on_zoom_clicked), _("Zoom Mode"))); toollist.push_back(RadioTree(radiotree)); toollist.push_back(Separator()); toollist.push_back(Item(Icon(Gtk::Stock::ZOOM_IN), _("In"), - slot(*this, &AudioCDProject::on_zoom_in_clicked), + mem_fun(*this, &AudioCDProject::on_zoom_in_clicked), _("Zoom In"))); toollist.push_back(Item(Icon(Gtk::Stock::ZOOM_OUT), _("Out"), - slot(*this, &AudioCDProject::on_zoom_out_clicked), + mem_fun(*this, &AudioCDProject::on_zoom_out_clicked), _("Zoom Out"))); toollist.push_back(Item(Icon(Gtk::Stock::ZOOM_FIT), _("Fit"), - slot(*this, &AudioCDProject::on_zoom_fit_clicked), + mem_fun(*this, &AudioCDProject::on_zoom_fit_clicked), _("Zoom Fit"))); Array& realtb = create_toolbar(toollist); @@ -414,6 +414,7 @@ void AudioCDProject::createToolbar2() { +#if 0 using namespace Gnome::UI::Items; using namespace Gtk::Toolbar_Helpers; @@ -460,6 +461,7 @@ BONOBO_DOCK_TOP, 0, 0, 0); toolbar->set_toolbar_style(Gtk::TOOLBAR_BOTH); toolbar->set_icon_size(Gtk::ICON_SIZE_SMALL_TOOLBAR); +#endif } void AudioCDProject::on_play_clicked() diff -ru -x configure cdrdao-1.1.8/xdao/AudioCDView.cc cdrdao-1.1.8.new2/xdao/AudioCDView.cc --- cdrdao-1.1.8/xdao/AudioCDView.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/AudioCDView.cc 2004-05-22 15:09:15.940159064 +0200 @@ -53,15 +53,15 @@ std::list drop_types; - drop_types.push_back(Gtk::TargetEntry("text/uri-list", 0, TARGET_URI_LIST)); + drop_types.push_back(Gtk::TargetEntry("text/uri-list", Gtk::TargetFlags(0), TARGET_URI_LIST)); drag_dest_set(drop_types, Gtk::DEST_DEFAULT_MOTION | Gtk::DEST_DEFAULT_HIGHLIGHT | Gtk::DEST_DEFAULT_DROP); - - signal_drag_data_received().connect(slot(*this, &AudioCDView::drag_data_received_cb)); - +#if 0 + signal_drag_data_received().connect(mem_fun(*this, &AudioCDView::drag_data_received_cb)); +#endif sampleDisplay_ = new SampleDisplay; sampleDisplay_->setTocEdit(child->tocEdit()); @@ -85,7 +85,7 @@ markerPos_ = new Gtk::Entry; markerPos_->set_editable(true); markerPos_->set_size_request(entry_width, -1); - markerPos_->signal_activate().connect(slot(*this, &AudioCDView::markerSet)); + markerPos_->signal_activate().connect(mem_fun(*this, &AudioCDView::markerSet)); cursorPos_ = new Gtk::Label; cursorPos_->set_size_request(entry_width, -1); @@ -94,13 +94,13 @@ selectionStartPos_->set_editable(true); selectionStartPos_->set_size_request(entry_width, -1); selectionStartPos_->signal_activate(). - connect(slot(*this, &AudioCDView::selectionSet)); + connect(mem_fun(*this, &AudioCDView::selectionSet)); selectionEndPos_ = new Gtk::Entry; selectionEndPos_->set_editable(true); selectionEndPos_->set_size_request(entry_width, -1); selectionEndPos_->signal_activate(). - connect(slot(*this, &AudioCDView::selectionSet)); + connect(mem_fun(*this, &AudioCDView::selectionSet)); label = new Gtk::Label(_("Cursor: ")); selectionInfoBox->pack_start(*label, FALSE, FALSE); @@ -136,19 +136,19 @@ setMode(SELECT); - sampleDisplay_->markerSet.connect(slot(*this, + sampleDisplay_->markerSet.connect(mem_fun(*this, &AudioCDView::markerSetCallback)); - sampleDisplay_->selectionSet.connect(slot(*this, + sampleDisplay_->selectionSet.connect(mem_fun(*this, &AudioCDView::selectionSetCallback)); - sampleDisplay_->selectionCleared.connect(slot(*this, + sampleDisplay_->selectionCleared.connect(mem_fun(*this, &AudioCDView::selectionClearedCallback)); - sampleDisplay_->cursorMoved.connect(slot(*this, + sampleDisplay_->cursorMoved.connect(mem_fun(*this, &AudioCDView::cursorMovedCallback)); - sampleDisplay_->trackMarkSelected.connect(slot(*this, + sampleDisplay_->trackMarkSelected.connect(mem_fun(*this, &AudioCDView::trackMarkSelectedCallback)); - sampleDisplay_->trackMarkMoved.connect(slot(*this, + sampleDisplay_->trackMarkMoved.connect(mem_fun(*this, &AudioCDView::trackMarkMovedCallback)); - sampleDisplay_->viewModified.connect(slot(*this, + sampleDisplay_->viewModified.connect(mem_fun(*this, &AudioCDView::viewModifiedCallback)); tocEditView_->sampleViewFull(); @@ -162,79 +162,79 @@ menus.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::PROPERTIES)), _("Track Info..."), - slot(*this, &AudioCDView::trackInfo), + mem_fun(*this, &AudioCDView::trackInfo), _("Edit track data"))); menus.push_back(Separator()); info = Item(Icon(Gtk::StockID(Gtk::Stock::CUT)), _("Cut"), - slot(*this, &AudioCDView::cutTrackData), + mem_fun(*this, &AudioCDView::cutTrackData), _("Cut out selected samples")); - info.set_accel(Gtk::Menu::AccelKey("x")); + info.set_accel(Gtk::AccelKey("x")); menus.push_back(info); info = Item(Icon(Gtk::StockID(Gtk::Stock::PASTE)), _("Paste"), - slot(*this, &AudioCDView::pasteTrackData), + mem_fun(*this, &AudioCDView::pasteTrackData), _("Paste previously cut samples")); - info.set_accel(Gtk::Menu::AccelKey("v")); + info.set_accel(Gtk::AccelKey("v")); menus.push_back(info); menus.push_back(Separator()); info = Item(_("Add Track Mark"), - slot(*this, &AudioCDView::addTrackMark), + mem_fun(*this, &AudioCDView::addTrackMark), _("Add track marker at current marker position")); - info.set_accel(Gtk::Menu::AccelKey("T")); + info.set_accel(Gtk::AccelKey("T")); menus.push_back(info); info = Item(_("Add Index Mark"), - slot(*this, &AudioCDView::addIndexMark), + mem_fun(*this, &AudioCDView::addIndexMark), _("Add index marker at current marker position")); - info.set_accel(Gtk::Menu::AccelKey("I")); + info.set_accel(Gtk::AccelKey("I")); menus.push_back(info); info = Item(_("Add Pre-Gap"), - slot(*this, &AudioCDView::addPregap), + mem_fun(*this, &AudioCDView::addPregap), _("Add pre-gap at current marker position")); - info.set_accel(Gtk::Menu::AccelKey("P")); + info.set_accel(Gtk::AccelKey("P")); menus.push_back(info); info = Item(_("Remove Track Mark"), - slot(*this, &AudioCDView::removeTrackMark), + mem_fun(*this, &AudioCDView::removeTrackMark), _("Remove selected track/index marker or pre-gap")); - info.set_accel(Gtk::Menu::AccelKey("D")); + info.set_accel(Gtk::AccelKey("D")); menus.push_back(info); menus.push_back(Separator()); info = Item(_("Append Track"), - slot(*this, &AudioCDView::appendTrack), + mem_fun(*this, &AudioCDView::appendTrack), _("Append track with data from audio file")); - info.set_accel(Gtk::Menu::AccelKey("T")); + info.set_accel(Gtk::AccelKey("T")); menus.push_back(info); info = Item(_("Append File"), - slot(*this, &AudioCDView::appendFile), + mem_fun(*this, &AudioCDView::appendFile), _("Append data from audio file to last track")); - info.set_accel(Gtk::Menu::AccelKey("F")); + info.set_accel(Gtk::AccelKey("F")); menus.push_back(info); info = Item(_("Insert File"), - slot(*this, &AudioCDView::insertFile), + mem_fun(*this, &AudioCDView::insertFile), _("Insert data from audio file at current marker position")); - info.set_accel(Gtk::Menu::AccelKey("I")); + info.set_accel(Gtk::AccelKey("I")); menus.push_back(info); menus.push_back(Separator()); menus.push_back(Item(_("Append Silence"), - slot(*this, &AudioCDView::appendSilence), + mem_fun(*this, &AudioCDView::appendSilence), _("Append silence to last track"))); menus.push_back(Item(_("Insert Silence"), - slot(*this, &AudioCDView::insertSilence), + mem_fun(*this, &AudioCDView::insertSilence), _("Insert silence at current marker position"))); Array& arrayInfo = project->insert_menus(_("Edit/CD-TEXT..."), @@ -475,11 +475,10 @@ guiUpdate(); } -void -AudioCDView::drag_data_received_cb(const - Glib::RefPtr& context, +void +AudioCDView::drag_data_received_cb(const Glib::RefPtr& context, gint x, gint y, - GtkSelectionData *selection_data, + const GtkSelectionData *selection_data, guint info, guint time) { GList *names = NULL; diff -ru -x configure cdrdao-1.1.8/xdao/AudioCDView.h cdrdao-1.1.8.new2/xdao/AudioCDView.h --- cdrdao-1.1.8/xdao/AudioCDView.h 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/AudioCDView.h 2004-05-22 15:09:15.941158912 +0200 @@ -43,7 +43,7 @@ public: AudioCDView(AudioCDChild *child, AudioCDProject *project); ~AudioCDView(); - SigC::Signal0 add_view; + sigc::signal0 add_view; void update(unsigned long level); @@ -104,9 +104,9 @@ void selectionSet(); void drag_data_received_cb(const Glib::RefPtr& context, - gint x, gint y, GtkSelectionData *selection_data, - guint info, guint time); - + gint x, gint y, + const GtkSelectionData *selection_data, + guint info, guint time); }; #endif diff -ru -x configure cdrdao-1.1.8/xdao/BlankCDDialog.cc cdrdao-1.1.8.new2/xdao/BlankCDDialog.cc --- cdrdao-1.1.8/xdao/BlankCDDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/BlankCDDialog.cc 2004-05-22 15:09:15.942158760 +0200 @@ -72,7 +72,7 @@ moreOptionsBox->pack_start(*moreOptionsLabel, false, false, 4); moreOptionsButton->add(*moreOptionsBox); moreOptionsButton->signal_clicked(). - connect(slot(*this, &BlankCDDialog::moreOptions)); + connect(mem_fun(*this, &BlankCDDialog::moreOptions)); moreOptionsBox = manage(new Gtk::HBox); frameBox->pack_start(*moreOptionsBox); moreOptionsBox->pack_end(*moreOptionsButton, false, false); @@ -88,7 +88,7 @@ startBox->pack_start(*startLabel, false, false); button->add(*startBox); - button->signal_clicked().connect(slot(*this, &BlankCDDialog::startAction)); + button->signal_clicked().connect(mem_fun(*this, &BlankCDDialog::startAction)); Gtk::HBox *hbox2 = manage(new Gtk::HBox); hbox2->set_spacing(20); @@ -97,7 +97,7 @@ Gtk::Button* cancel_but = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::CANCEL))); - cancel_but->signal_clicked().connect(slot(*this, &BlankCDDialog::stop)); + cancel_but->signal_clicked().connect(mem_fun(*this, &BlankCDDialog::stop)); hbox2->pack_start(*cancel_but); vbox->pack_start(*hbox2, Gtk::PACK_SHRINK); @@ -107,9 +107,9 @@ void BlankCDDialog::moreOptions() { if (!moreOptionsDialog_) { - moreOptionsDialog_ = new Gtk::MessageDialog(*this, _("Blank options"), + moreOptionsDialog_ = new Gtk::MessageDialog(*this, _("Blank options"), false, Gtk::MESSAGE_QUESTION, - Gtk::BUTTONS_CLOSE); + Gtk::BUTTONS_CLOSE, true); Gtk::VBox *vbox = moreOptionsDialog_->get_vbox(); Gtk::Frame *frame = new Gtk::Frame(_(" More Blank Options ")); @@ -137,13 +137,13 @@ speedSpinButton_->set_digits(0); speedSpinButton_->set_sensitive(false); adjustment->signal_value_changed(). - connect(slot(*this, &BlankCDDialog::speedChanged)); + connect(mem_fun(*this, &BlankCDDialog::speedChanged)); hbox->pack_start(*speedSpinButton_, false, false, 10); speedButton_ = new Gtk::CheckButton(_("Use max."), 0); speedButton_->set_active(true); speedButton_->signal_toggled(). - connect(slot(*this, &BlankCDDialog::speedButtonChanged)); + connect(mem_fun(*this, &BlankCDDialog::speedButtonChanged)); hbox->pack_start(*speedButton_, true, true); vbox->pack_start(*hbox); moreOptionsDialog_->show_all_children(); diff -ru -x configure cdrdao-1.1.8/xdao/CdDevice.cc cdrdao-1.1.8.new2/xdao/CdDevice.cc --- cdrdao-1.1.8/xdao/CdDevice.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/CdDevice.cc 2004-05-22 15:09:15.944158456 +0200 @@ -439,7 +439,7 @@ action_ = A_RECORD; if (process_->commFd() >= 0) { - Glib::signal_io().connect(bind(slot(*this, &CdDevice::updateProgress), + Glib::signal_io().connect(bind(mem_fun(*this, &CdDevice::updateProgress), process_->commFd()), process_->commFd(), Glib::IO_IN | Glib::IO_HUP); @@ -572,7 +572,7 @@ action_ = A_READ; if (process_->commFd() >= 0) { - Glib::signal_io().connect(bind(slot(*this, &CdDevice::updateProgress), + Glib::signal_io().connect(bind(mem_fun(*this, &CdDevice::updateProgress), process_->commFd()), process_->commFd(), Glib::IO_IN | Glib::IO_PRI | @@ -728,7 +728,7 @@ action_ = A_DUPLICATE; if (process_->commFd() >= 0) { - Glib::signal_io().connect(bind(slot(*this, &CdDevice::updateProgress), + Glib::signal_io().connect(bind(mem_fun(*this, &CdDevice::updateProgress), process_->commFd()), process_->commFd(), Glib::IO_IN | Glib::IO_HUP); @@ -834,7 +834,7 @@ action_ = A_BLANK; if (process_->commFd() >= 0) { - Glib::signal_io().connect(bind(slot(*this, &CdDevice::updateProgress), + Glib::signal_io().connect(bind(mem_fun(*this, &CdDevice::updateProgress), process_->commFd()), process_->commFd(), Glib::IO_IN | Glib::IO_HUP); diff -ru -x configure cdrdao-1.1.8/xdao/CdDevice.h cdrdao-1.1.8.new2/xdao/CdDevice.h --- cdrdao-1.1.8/xdao/CdDevice.h 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/CdDevice.h 2004-05-22 15:09:15.957156480 +0200 @@ -30,7 +30,7 @@ class Process; class ScsiIf; -class CdDevice : public SigC::Object +class CdDevice : public sigc::trackable { public: enum Status { DEV_READY, DEV_RECORDING, DEV_READING, DEV_WAITING, DEV_BUSY, diff -ru -x configure cdrdao-1.1.8/xdao/CdTextDialog.cc cdrdao-1.1.8.new2/xdao/CdTextDialog.cc --- cdrdao-1.1.8/xdao/CdTextDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/CdTextDialog.cc 2004-05-22 15:09:15.959156176 +0200 @@ -55,7 +55,7 @@ new Gtk::CheckButton(_("Enable Perfomer Entries")); page_[i].performerButton->set_active(false); page_[i].performerButton->signal_toggled(). - connect(bind(slot(*this, &CdTextDialog::activatePerformerAction), i)); + connect(bind(mem_fun(*this, &CdTextDialog::activatePerformerAction), i)); page_[i].tracks = NULL; page_[i].table->attach(*(new Gtk::Label(_("Performer"))), 1, 2, 0, 1); page_[i].table->attach(*(new Gtk::Label(_("Title"))), 2, 3, 0, 1); @@ -108,15 +108,15 @@ applyButton_ = new Gtk::Button(Gtk::StockID(Gtk::Stock::APPLY)); bbox->pack_start(*applyButton_); - applyButton_->signal_clicked().connect(slot(*this, &CdTextDialog::applyAction)); + applyButton_->signal_clicked().connect(mem_fun(*this, &CdTextDialog::applyAction)); Gtk::Button *fillButton = new Gtk::Button(_(" Fill Performer ")); bbox->pack_start(*fillButton); - fillButton->signal_clicked().connect(slot(*this, &CdTextDialog::fillPerformerAction)); + fillButton->signal_clicked().connect(mem_fun(*this, &CdTextDialog::fillPerformerAction)); Gtk::Button *cancelButton = new Gtk::Button(Gtk::StockID(Gtk::Stock::CLOSE)); bbox->pack_start(*cancelButton); - cancelButton->signal_clicked().connect(slot(*this, &CdTextDialog::stop)); + cancelButton->signal_clicked().connect(mem_fun(*this, &CdTextDialog::stop)); get_action_area()->pack_start(*bbox); diff -ru -x configure cdrdao-1.1.8/xdao/DeviceConfDialog.cc cdrdao-1.1.8.new2/xdao/DeviceConfDialog.cc --- cdrdao-1.1.8/xdao/DeviceConfDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/DeviceConfDialog.cc 2004-05-22 15:09:15.960156024 +0200 @@ -65,14 +65,14 @@ selectedRow_ = list_.get_selection()->get_selected(); list_.get_selection()->signal_changed(). - connect(slot(*this, &DeviceConfDialog::selectionChanged)); + connect(mem_fun(*this, &DeviceConfDialog::selectionChanged)); Gtk::Menu *dmenu = manage(new Gtk::Menu); Gtk::MenuItem *mi; for (i = 0; i <= CdDevice::maxDriverId(); i++) { mi = manage(new Gtk::MenuItem(CdDevice::driverName(i))); - mi->signal_activate().connect(bind(slot(*this, + mi->signal_activate().connect(bind(mem_fun(*this, &DeviceConfDialog::setDriverId), i)); mi->show(); @@ -87,7 +87,7 @@ for (i = 0; i <= MAX_DEVICE_TYPE_ID; i++) { mi = manage(new Gtk::MenuItem(CdDevice::deviceType2string(ID2DEVICE_TYPE[i]))); - mi->signal_activate().connect(bind(slot(*this, + mi->signal_activate().connect(bind(mem_fun(*this, &DeviceConfDialog::setDeviceType), i)); mi->show(); @@ -127,12 +127,12 @@ button = manage(new Gtk::Button(_("Rescan"))); bbox->pack_start(*button); button->signal_clicked(). - connect(SigC::slot(*this,&DeviceConfDialog::rescanAction)); + connect(sigc::mem_fun(*this,&DeviceConfDialog::rescanAction)); button = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::DELETE))); bbox->pack_start(*button); button->signal_clicked(). - connect(SigC::slot(*this,&DeviceConfDialog::deleteDeviceAction)); + connect(sigc::mem_fun(*this,&DeviceConfDialog::deleteDeviceAction)); listBox->pack_start(*bbox, Gtk::PACK_SHRINK); @@ -193,7 +193,7 @@ manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::ADD))); bbox->pack_start(*addButton); addButton->signal_clicked(). - connect(slot(*this, &DeviceConfDialog::addDeviceAction)); + connect(mem_fun(*this, &DeviceConfDialog::addDeviceAction)); addDeviceBox->pack_start(*bbox); addDeviceFrame_.add(*addDeviceBox); @@ -207,18 +207,18 @@ Gtk::Button* applyButton = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::APPLY))); bbox->pack_start(*applyButton); - applyButton->signal_clicked().connect(slot(*this, + applyButton->signal_clicked().connect(mem_fun(*this, &DeviceConfDialog::applyAction)); Gtk::Button *resetButton = manage(new Gtk::Button(_("Reset"))); bbox->pack_start(*resetButton); - resetButton->signal_clicked().connect(slot(*this, + resetButton->signal_clicked().connect(mem_fun(*this, &DeviceConfDialog::resetAction)); Gtk::Button *cancelButton = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::CLOSE))); bbox->pack_start(*cancelButton); - cancelButton->signal_clicked().connect(slot(*this, + cancelButton->signal_clicked().connect(mem_fun(*this, &DeviceConfDialog::closeAction)); contents->pack_start(*bbox, Gtk::PACK_SHRINK); diff -ru -x configure cdrdao-1.1.8/xdao/DumpCDProject.cc cdrdao-1.1.8.new2/xdao/DumpCDProject.cc --- cdrdao-1.1.8/xdao/DumpCDProject.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/DumpCDProject.cc 2004-05-22 15:09:15.962155720 +0200 @@ -66,7 +66,7 @@ startBox->pack_start(*pixmap, false, false); startBox->pack_start(*startLabel, false, false); button->add(*startBox); - button->signal_clicked().connect(slot(*this, &DumpCDProject::start)); + button->signal_clicked().connect(mem_fun(*this, &DumpCDProject::start)); bbox->pack_start(*button, Gtk::PACK_EXPAND_PADDING); top_vbox->pack_start(*bbox, Gtk::PACK_SHRINK); diff -ru -x configure cdrdao-1.1.8/xdao/DuplicateCDProject.cc cdrdao-1.1.8.new2/xdao/DuplicateCDProject.cc --- cdrdao-1.1.8/xdao/DuplicateCDProject.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/DuplicateCDProject.cc 2004-05-22 15:09:15.962155720 +0200 @@ -84,7 +84,7 @@ startBox->pack_start(*startLabel, false, false); button->add(*startBox); - button->signal_clicked().connect(slot(*this, &DuplicateCDProject::start)); + button->signal_clicked().connect(mem_fun(*this, &DuplicateCDProject::start)); hbox->pack_start(*button, true, false); diff -ru -x configure cdrdao-1.1.8/xdao/gcdmaster.cc cdrdao-1.1.8.new2/xdao/gcdmaster.cc --- cdrdao-1.1.8/xdao/gcdmaster.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/gcdmaster.cc 2004-05-22 15:09:15.964155416 +0200 @@ -40,7 +40,7 @@ blankCDDialog_ = 0; readFileSelector_.get_cancel_button()->signal_clicked(). - connect(slot(*this, &GCDMaster::readFileSelectorCancelCB)); + connect(mem_fun(*this, &GCDMaster::readFileSelectorCancelCB)); Icons::registerStockIcons(); } @@ -79,7 +79,7 @@ void GCDMaster::openProject(ProjectChooser *projectChooser) { readFileSelector_.get_ok_button()->signal_clicked(). - connect(bind(slot(*this, &GCDMaster::readFileSelectorOKCB), + connect(bind(mem_fun(*this, &GCDMaster::readFileSelectorOKCB), projectChooser)); readFileSelector_.show(); diff -ru -x configure cdrdao-1.1.8/xdao/MessageBox.cc cdrdao-1.1.8.new2/xdao/MessageBox.cc --- cdrdao-1.1.8/xdao/MessageBox.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/MessageBox.cc 2004-05-22 15:09:15.965155264 +0200 @@ -72,7 +72,7 @@ for (i = 1; i <= nButtons; i++) { Gtk::Button* button = manage(createButton(buttons[i - 1])); button->show(); - button->signal_clicked().connect(bind(slot(*this, + button->signal_clicked().connect(bind(mem_fun(*this, &MessageBoxBase::buttonAction), i)); bbox->add(*button); diff -ru -x configure cdrdao-1.1.8/xdao/ProgressDialog.cc cdrdao-1.1.8.new2/xdao/ProgressDialog.cc --- cdrdao-1.1.8/xdao/ProgressDialog.cc 2004-02-12 02:13:31.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/ProgressDialog.cc 2004-05-22 15:09:15.966155112 +0200 @@ -126,9 +126,9 @@ actCloseButtonLabel_ = 2; cancelButton_->signal_clicked(). - connect(SigC::slot(*this, &ProgressDialog::closeAction)); + connect(sigc::mem_fun(*this, &ProgressDialog::closeAction)); closeButton_->signal_clicked(). - connect(SigC::slot(*this, &ProgressDialog::closeAction)); + connect(sigc::mem_fun(*this, &ProgressDialog::closeAction)); get_action_area()->pack_start(*bbox); set_size_request(400, -1); @@ -156,7 +156,7 @@ clear(); - Glib::signal_timeout().connect(slot(*this, &ProgressDialog::time), 1000); + Glib::signal_timeout().connect(mem_fun(*this, &ProgressDialog::time), 1000); statusMsg_->set_text(_("Initializing...")); tocName_->set_text(tocFileName); diff -ru -x configure cdrdao-1.1.8/xdao/Project.cc cdrdao-1.1.8.new2/xdao/Project.cc --- cdrdao-1.1.8/xdao/Project.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/Project.cc 2004-05-22 15:09:15.968154808 +0200 @@ -65,27 +65,27 @@ using namespace Gnome::UI::Items; using namespace Gnome::UI::MenuItems; fileMenuTree.push_back(New(_("New..."), _("Create a new project"), - slot(*gcdmaster, + mem_fun(*gcdmaster, &GCDMaster::newChooserWindow))); // File->New menu newMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::NEW)), _("_Audio CD"), - bind(slot(*gcdmaster, + bind(mem_fun(*gcdmaster, &GCDMaster::newAudioCDProject2), (ProjectChooser *)NULL), _("New Audio CD"))); newMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::NEW)), _("_Duplicate CD"), - bind(slot(*gcdmaster, + bind(mem_fun(*gcdmaster, &GCDMaster::newDuplicateCDProject), (ProjectChooser *)NULL), _("Make a copy of a CD"))); newMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::NEW)), _("_Copy CD to disk"), - bind(slot(*gcdmaster, + bind(mem_fun(*gcdmaster, &GCDMaster::newDumpCDProject), (ProjectChooser *)NULL), _("Dump CD to disk"))); @@ -101,28 +101,28 @@ guint posFileSaveAs; { using namespace Gnome::UI::MenuItems; - fileMenuTree.push_back(Open(bind(slot(*gcdmaster, + fileMenuTree.push_back(Open(bind(mem_fun(*gcdmaster, &GCDMaster::openProject), (ProjectChooser *)0))); - fileMenuTree.push_back(Save(slot(*this, &Project::saveProject))); + fileMenuTree.push_back(Save(mem_fun(*this, &Project::saveProject))); posFileSave = fileMenuTree.size() - 1; - fileMenuTree.push_back(SaveAs(slot(*this, &Project::saveAsProject))); + fileMenuTree.push_back(SaveAs(mem_fun(*this, &Project::saveAsProject))); posFileSaveAs = fileMenuTree.size() - 1; fileMenuTree.push_back(Gnome::UI::Items::Separator()); -// fileMenuTree.push_back(PrintSetup(slot(*this, &Project::nothing_cb))); +// fileMenuTree.push_back(PrintSetup(mem_fun(*this, &Project::nothing_cb))); // // fileMenuTree.push_back(Gnome::UI::Item(Gnome::UI::Icon(GNOME_STOCK_MENU_PRINT), // "Print Cover...", -// slot(*this, &Project::nothing_cb), +// mem_fun(*this, &Project::nothing_cb), // "Print Cover")); // // fileMenuTree.push_back(Gnome::UI::Items::Separator()); // Close the current child (project); - fileMenuTree.push_back(Close(bind(slot(*gcdmaster, &GCDMaster::closeProject), this))); - fileMenuTree.push_back(Exit(bind(slot(*gcdmaster, &GCDMaster::appClose), this))); + fileMenuTree.push_back(Close(bind(mem_fun(*gcdmaster, &GCDMaster::closeProject), this))); + fileMenuTree.push_back(Exit(bind(mem_fun(*gcdmaster, &GCDMaster::appClose), this))); } guint posActionsRecord; @@ -132,43 +132,43 @@ editMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::PROPERTIES)), _("Project Info..."), - slot(*this, &Project::projectInfo), + mem_fun(*this, &Project::projectInfo), _("Edit global project data"))); // Actions menu actionsMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::CDROM)), _("_Record"), - slot(*this, &Project::recordToc2CD), + mem_fun(*this, &Project::recordToc2CD), _("Record"))); posActionsRecord = actionsMenuTree.size() - 1; actionsMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::CDROM)), _("Blank CD-RW"), - bind(slot(*gcdmaster, + bind(mem_fun(*gcdmaster, &GCDMaster::blankCDRW), this), _("Erase a CD-RW"))); // actionsMenuTree.push_back(Gnome::UI::Item("Fixate CD", -// slot(*this, &Project::nothing_cb))); +// mem_fun(*this, &Project::nothing_cb))); // actionsMenuTree.push_back(Gnome::UI::Item("Get Info", -// slot(*this, &Project::nothing_cb))); +// mem_fun(*this, &Project::nothing_cb))); // Settings menu settingsMenuTree.push_back(Item(Icon(Gtk::StockID(Gtk::Stock::PREFERENCES)), _("Configure Devices..."), - slot(*gcdmaster, &GCDMaster::configureDevices))); + mem_fun(*gcdmaster, &GCDMaster::configureDevices))); } // settingsMenuTree.push_back(Gnome::UI::MenuItems::Preferences -// (slot(*this, &Project::nothing_cb))); +// (mem_fun(*this, &Project::nothing_cb))); // Help menu //helpMenuTree.push_back(Gnome::UI::Help("Quick Start")); helpMenuTree.push_back(Gnome::UI::MenuItems::About - (slot(*this, &Project::aboutDialog))); + (mem_fun(*this, &Project::aboutDialog))); { using namespace Gnome::UI::Menus; @@ -261,9 +261,9 @@ if (!saveFileSelector_) { saveFileSelector_ = new Gtk::FileSelection(_("Save Project")); saveFileSelector_->get_ok_button()->signal_clicked(). - connect(slot(*this, &Project::saveFileSelectorOKCB)); + connect(mem_fun(*this, &Project::saveFileSelectorOKCB)); saveFileSelector_->get_cancel_button()->signal_clicked(). - connect(slot(*this, &Project::saveFileSelectorCancelCB)); + connect(mem_fun(*this, &Project::saveFileSelectorCancelCB)); saveFileSelector_->set_transient_for(*this); } diff -ru -x configure cdrdao-1.1.8/xdao/ProjectChooser.cc cdrdao-1.1.8.new2/xdao/ProjectChooser.cc --- cdrdao-1.1.8/xdao/ProjectChooser.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/ProjectChooser.cc 2004-05-22 15:09:15.969154656 +0200 @@ -79,13 +79,13 @@ // Connect button signals openButton.signal_clicked(). - connect(bind(slot(*gcdmaster, &GCDMaster::openProject), this)); + connect(bind(mem_fun(*gcdmaster, &GCDMaster::openProject), this)); audioCDButton.signal_clicked(). - connect(bind(slot(*gcdmaster, &GCDMaster::newAudioCDProject2), this)); + connect(bind(mem_fun(*gcdmaster, &GCDMaster::newAudioCDProject2), this)); copyCDButton.signal_clicked(). - connect(bind(slot(*gcdmaster, &GCDMaster::newDuplicateCDProject), this)); + connect(bind(mem_fun(*gcdmaster, &GCDMaster::newDuplicateCDProject), this)); dumpCDButton.signal_clicked(). - connect(bind(slot(*gcdmaster, &GCDMaster::newDumpCDProject), this)); + connect(bind(mem_fun(*gcdmaster, &GCDMaster::newDumpCDProject), this)); vbox.show_all(); } diff -ru -x configure cdrdao-1.1.8/xdao/RecordCDSource.cc cdrdao-1.1.8.new2/xdao/RecordCDSource.cc --- cdrdao-1.1.8/xdao/RecordCDSource.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/RecordCDSource.cc 2004-05-22 15:09:15.970154504 +0200 @@ -95,13 +95,13 @@ speedSpinButton_->set_digits(0); speedSpinButton_->show(); speedSpinButton_->set_sensitive(false); - adjustment->signal_value_changed().connect(SigC::slot(*this, &RecordCDSource::speedChanged)); + adjustment->signal_value_changed().connect(sigc::mem_fun(*this, &RecordCDSource::speedChanged)); hbox->pack_start(*speedSpinButton_, false, false, 10); speedButton_ = new Gtk::CheckButton(_("Use max."), 0); speedButton_->set_active(true); speedButton_->show(); - speedButton_->signal_toggled().connect(SigC::slot(*this, &RecordCDSource::speedButtonChanged)); + speedButton_->signal_toggled().connect(sigc::mem_fun(*this, &RecordCDSource::speedButtonChanged)); hbox->pack_start(*speedButton_, true, true); vbox->pack_start(*hbox); @@ -115,7 +115,7 @@ moreOptionsBox->pack_start(*moreOptionsPixmap, false, false, 3); moreOptionsBox->pack_start(*moreOptionsLabel, false, false, 4); moreOptionsButton->add(*moreOptionsBox); - moreOptionsButton->signal_clicked().connect(slot(*this, &RecordCDSource::moreOptions)); + moreOptionsButton->signal_clicked().connect(mem_fun(*this, &RecordCDSource::moreOptions)); moreOptionsPixmap->show(); moreOptionsLabel->show(); moreOptionsBox->show(); @@ -180,9 +180,9 @@ table->set_col_spacings(10); table->set_border_width(5); - moreOptionsDialog_ = new Gtk::MessageDialog(*parent_, _("Source options"), + moreOptionsDialog_ = new Gtk::MessageDialog(*parent_, _("Source options"),false, Gtk::MESSAGE_QUESTION, - Gtk::BUTTONS_CLOSE); + Gtk::BUTTONS_CLOSE, true); Gtk::VBox *vbox = moreOptionsDialog_->get_vbox(); Gtk::Frame *frame = new Gtk::Frame(_(" More Source Options ")); @@ -209,7 +209,7 @@ for (int i = 0; i <= MAX_CORRECTION_ID; i++) { mitem = manage(new Gtk::MenuItem(CORRECTION_TABLE[i].name)); - mitem->signal_activate().connect(bind(slot(*this, &RecordCDSource::setCorrection), i)); + mitem->signal_activate().connect(bind(mem_fun(*this, &RecordCDSource::setCorrection), i)); menu->append(*mitem); } @@ -231,7 +231,7 @@ for (int i = 0; i <= MAX_SUBCHAN_READ_MODE_ID; i++) { mitem = manage(new Gtk::MenuItem(SUBCHAN_READ_MODE_TABLE[i].name)); mitem->signal_activate(). - connect(bind(slot(*this, &RecordCDSource::setSubChanReadMode), i)); + connect(bind(mem_fun(*this, &RecordCDSource::setSubChanReadMode), i)); menu->append(*mitem); } diff -ru -x configure cdrdao-1.1.8/xdao/RecordCDTarget.cc cdrdao-1.1.8.new2/xdao/RecordCDTarget.cc --- cdrdao-1.1.8/xdao/RecordCDTarget.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/RecordCDTarget.cc 2004-05-22 15:09:15.972154200 +0200 @@ -71,13 +71,13 @@ speedSpinButton_->set_digits(0); speedSpinButton_->show(); speedSpinButton_->set_sensitive(false); - adjustment->signal_value_changed().connect(SigC::slot(*this, &RecordCDTarget::speedChanged)); + adjustment->signal_value_changed().connect(sigc::mem_fun(*this, &RecordCDTarget::speedChanged)); hbox->pack_start(*speedSpinButton_, false, false, 10); speedButton_ = new Gtk::CheckButton("Use max.", 0); speedButton_->set_active(true); speedButton_->show(); - speedButton_->signal_toggled().connect(SigC::slot(*this, &RecordCDTarget::speedButtonChanged)); + speedButton_->signal_toggled().connect(sigc::mem_fun(*this, &RecordCDTarget::speedButtonChanged)); hbox->pack_start(*speedButton_, true, true); vbox->pack_start(*hbox); @@ -104,7 +104,7 @@ moreOptionsBox->pack_start(*moreOptionsPixmap, false, false, 3); moreOptionsBox->pack_start(*moreOptionsLabel, false, false, 4); moreOptionsButton->add(*moreOptionsBox); - moreOptionsButton->signal_clicked().connect(slot(*this, &RecordCDTarget::moreOptions)); + moreOptionsButton->signal_clicked().connect(mem_fun(*this, &RecordCDTarget::moreOptions)); moreOptionsPixmap->show(); moreOptionsLabel->show(); moreOptionsBox->show(); @@ -145,9 +145,9 @@ { if (!moreOptionsDialog_) { - moreOptionsDialog_ = new Gtk::MessageDialog(*parent_, "Target options", + moreOptionsDialog_ = new Gtk::MessageDialog(*parent_, "Target options",false, Gtk::MESSAGE_QUESTION, - Gtk::BUTTONS_CLOSE); + Gtk::BUTTONS_CLOSE, true); Gtk::VBox *vbox = moreOptionsDialog_->get_vbox(); Gtk::Frame *frame = new Gtk::Frame(" More Target Options "); @@ -188,7 +188,7 @@ bufferRAMLabel_ = new Gtk::Label("= 1.72 Mb buffer.", 0); hbox->pack_start(*bufferRAMLabel_, true, true); adjustment->signal_value_changed(). - connect(SigC::slot(*this, &RecordCDTarget::updateBufferRAMLabel)); + connect(sigc::mem_fun(*this, &RecordCDTarget::updateBufferRAMLabel)); vbox->pack_start(*hbox); } diff -ru -x configure cdrdao-1.1.8/xdao/RecordTocDialog.cc cdrdao-1.1.8.new2/xdao/RecordTocDialog.cc --- cdrdao-1.1.8/xdao/RecordTocDialog.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/RecordTocDialog.cc 2004-05-22 15:09:15.973154048 +0200 @@ -81,12 +81,12 @@ startBox->pack_start(*startLabel, false, false); button->add(*startBox); - button->signal_clicked().connect(slot(*this, &RecordTocDialog::startAction)); + button->signal_clicked().connect(mem_fun(*this, &RecordTocDialog::startAction)); hbox->pack_start(*button); Gtk::Button* cancel_but = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::CANCEL))); - cancel_but->signal_clicked().connect(slot(*this, &Gtk::Widget::hide)); + cancel_but->signal_clicked().connect(mem_fun(*this, &Gtk::Widget::hide)); hbox->pack_start(*cancel_but); vbox->pack_start(*hbox, Gtk::PACK_SHRINK); diff -ru -x configure cdrdao-1.1.8/xdao/SampleDisplay.cc cdrdao-1.1.8.new2/xdao/SampleDisplay.cc --- cdrdao-1.1.8/xdao/SampleDisplay.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/SampleDisplay.cc 2004-05-22 15:09:15.975153744 +0200 @@ -114,20 +114,30 @@ "........."}; -SampleDisplay::SampleDisplay() +SampleDisplay::SampleDisplay(): + pixmap_(NULL), + trackMarkerPixmap_(NULL), + indexMarkerPixmap_(NULL), + trackMarkerSelectedPixmap_(NULL), + indexMarkerSelectedPixmap_(NULL), + trackExtendPixmap_(NULL), + indexExtendPixmap_(NULL), + drawGc_(NULL) + { adjustment_ = new Gtk::Adjustment(0.0, 0.0, 1.0); - adjustment_->signal_value_changed().connect(slot(*this, + adjustment_->signal_value_changed().connect(mem_fun(*this, &SampleDisplay::scrollTo)); trackManager_ = NULL; - pixmap_ = NULL; - trackMarkerPixmap_ = indexMarkerPixmap_ = NULL; - trackMarkerSelectedPixmap_ = indexMarkerSelectedPixmap_ = NULL; - trackExtendPixmap_ = indexExtendPixmap_ = NULL; + // pixmap_ = NULL; + // trackMarkerPixmap_ = indexMarkerPixmap_ = NULL; + // trackMarkerSelectedPixmap_ = indexMarkerSelectedPixmap_ = NULL; + // trackExtendPixmap_ = indexExtendPixmap_ = NULL; - drawGc_ = NULL; + //drawGc_ = NULL; + width_ = height_ = chanHeight_ = lcenter_ = rcenter_ = 0; timeLineHeight_ = timeLineY_ = 0; timeTickWidth_ = 0; @@ -151,20 +161,20 @@ selectedTrack_ = 0; selectedIndex_ = 0; - signal_expose_event().connect(slot(*this, + signal_expose_event().connect(mem_fun(*this, &SampleDisplay::handle_expose_event)); signal_configure_event(). - connect(slot(*this, &SampleDisplay::handle_configure_event)); + connect(mem_fun(*this, &SampleDisplay::handle_configure_event)); signal_motion_notify_event(). - connect(slot(*this, &SampleDisplay::handle_motion_notify_event)); + connect(mem_fun(*this, &SampleDisplay::handle_motion_notify_event)); signal_button_press_event(). - connect(slot(*this, &SampleDisplay::handleButtonPressEvent)); + connect(mem_fun(*this, &SampleDisplay::handleButtonPressEvent)); signal_button_release_event(). - connect(slot(*this, &SampleDisplay::handleButtonReleaseEvent)); + connect(mem_fun(*this, &SampleDisplay::handleButtonReleaseEvent)); signal_enter_notify_event(). - connect(slot(*this, &SampleDisplay::handleEnterEvent)); + connect(mem_fun(*this, &SampleDisplay::handleEnterEvent)); signal_leave_notify_event(). - connect(slot(*this, &SampleDisplay::handleLeaveEvent)); + connect(mem_fun(*this, &SampleDisplay::handleLeaveEvent)); set_events (Gdk::EXPOSURE_MASK | Gdk::LEAVE_NOTIFY_MASK diff -ru -x configure cdrdao-1.1.8/xdao/SampleDisplay.h cdrdao-1.1.8.new2/xdao/SampleDisplay.h --- cdrdao-1.1.8/xdao/SampleDisplay.h 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/SampleDisplay.h 2004-05-22 15:09:15.976153592 +0200 @@ -190,13 +190,13 @@ void updateToc(unsigned long, unsigned long); - SigC::Signal1 markerSet; - SigC::Signal1 cursorMoved; - SigC::Signal2 selectionSet; - SigC::Signal0 selectionCleared; - SigC::Signal3 trackMarkSelected; - SigC::Signal4 trackMarkMoved; - SigC::Signal2 viewModified; + sigc::signal1 markerSet; + sigc::signal1 cursorMoved; + sigc::signal2 selectionSet; + sigc::signal0 selectionCleared; + sigc::signal3 trackMarkSelected; + sigc::signal4 trackMarkMoved; + sigc::signal2 viewModified; protected: bool handle_configure_event (GdkEventConfigure *); diff -ru -x configure cdrdao-1.1.8/xdao/SampleManager.cc cdrdao-1.1.8.new2/xdao/SampleManager.cc --- cdrdao-1.1.8/xdao/SampleManager.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/SampleManager.cc 2004-05-22 15:09:15.978153288 +0200 @@ -94,7 +94,7 @@ #include "TrackDataScrap.h" -class SampleManagerImpl : public SigC::Object { +class SampleManagerImpl : public sigc::trackable { public: SampleManagerImpl(unsigned long); ~SampleManagerImpl(); @@ -225,7 +225,7 @@ void SampleManagerImpl::setAbortButton(Gtk::Button* button) { abortButton_ = button; - button->signal_clicked().connect(slot(*this, + button->signal_clicked().connect(mem_fun(*this, &SampleManagerImpl::abortAction)); } @@ -340,7 +340,7 @@ if (withGui_) { if (progressBar_) progressBar_->set_fraction(0.0); if (abortButton_) abortButton_->set_sensitive(true); - Glib::signal_idle().connect(slot(*this, &SampleManagerImpl::readSamples)); + Glib::signal_idle().connect(mem_fun(*this, &SampleManagerImpl::readSamples)); tocEdit_->blockEdit(); } else { while (readSamples()); diff -ru -x configure cdrdao-1.1.8/xdao/TocInfoDialog.cc cdrdao-1.1.8.new2/xdao/TocInfoDialog.cc --- cdrdao-1.1.8/xdao/TocInfoDialog.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/TocInfoDialog.cc 2004-05-22 15:09:15.980152984 +0200 @@ -136,23 +136,23 @@ mi = manage(new Gtk::MenuItem("CD-DA")); mi->signal_activate(). - connect(bind(slot(*this, &TocInfoDialog::setSelectedTocType), Toc::CD_DA)); + connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedTocType), Toc::CD_DA)); menu->append(*mi); mi = manage(new Gtk::MenuItem("CD-ROM")); mi->signal_activate(). - connect(bind(slot(*this, &TocInfoDialog::setSelectedTocType),Toc::CD_ROM)); + connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedTocType),Toc::CD_ROM)); menu->append(*mi); mi = manage(new Gtk::MenuItem("CD-ROM-XA")); mi->signal_activate(). - connect(bind(slot(*this, &TocInfoDialog::setSelectedTocType), + connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedTocType), Toc::CD_ROM_XA)); menu->append(*mi); mi = manage(new Gtk::MenuItem("CD-I")); mi->signal_activate(). - connect(bind(slot(*this, &TocInfoDialog::setSelectedTocType), Toc::CD_I)); + connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedTocType), Toc::CD_I)); menu->append(*mi); tocType_ = manage(new Gtk::OptionMenu); @@ -216,11 +216,11 @@ applyButton_ = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::APPLY))); bbox->pack_start(*applyButton_); - applyButton_->signal_clicked().connect(SigC::slot(*this,&TocInfoDialog::applyAction)); + applyButton_->signal_clicked().connect(sigc::mem_fun(*this,&TocInfoDialog::applyAction)); button = manage(new Gtk::Button(Gtk::StockID(Gtk::Stock::CLOSE))); bbox->pack_start(*button); - button->signal_clicked().connect(SigC::slot(*this,&TocInfoDialog::closeAction)); + button->signal_clicked().connect(sigc::mem_fun(*this,&TocInfoDialog::closeAction)); get_action_area()->pack_start(*bbox); show_all_children(); @@ -321,7 +321,7 @@ bval.value = i; mi = manage(new Gtk::MenuItem(CD_TEXT_LANGUAGE_CODES[i].name)); - mi->signal_activate().connect(bind(slot(*this, &TocInfoDialog::setSelectedCDTextLanguage), bval)); + mi->signal_activate().connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedCDTextLanguage), bval)); mi->show(); menu->append(*mi); } @@ -344,7 +344,7 @@ bval.value = i; mi = manage(new Gtk::MenuItem(CD_TEXT_GENRE_CODES[i].name)); - mi->signal_activate().connect(bind(slot(*this, &TocInfoDialog::setSelectedCDTextGenre), bval)); + mi->signal_activate().connect(bind(mem_fun(*this, &TocInfoDialog::setSelectedCDTextGenre), bval)); mi->show(); menu->append(*mi); } diff -ru -x configure cdrdao-1.1.8/xdao/TrackInfoDialog.cc cdrdao-1.1.8.new2/xdao/TrackInfoDialog.cc --- cdrdao-1.1.8/xdao/TrackInfoDialog.cc 2004-02-12 02:13:32.000000000 +0100 +++ cdrdao-1.1.8.new2/xdao/TrackInfoDialog.cc 2004-05-22 15:09:15.982152680 +0200 @@ -223,11 +223,11 @@ applyButton_ = new Gtk::Button(Gtk::StockID(Gtk::Stock::APPLY)); bbox->pack_start(*applyButton_); - applyButton_->signal_clicked().connect(slot(*this, &TrackInfoDialog::applyAction)); + applyButton_->signal_clicked().connect(mem_fun(*this, &TrackInfoDialog::applyAction)); button = new Gtk::Button(Gtk::StockID(Gtk::Stock::CLOSE)); bbox->pack_start(*button); - button->signal_clicked().connect(slot(*this, &TrackInfoDialog::closeAction)); + button->signal_clicked().connect(mem_fun(*this, &TrackInfoDialog::closeAction)); get_action_area()->pack_start(*bbox);