Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 15847 Details for
Bug 26323
Updated ebuild for xcdroast-0.98_alpha14 to allow dvd-burning
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
xcdroast-0.98alpha14-dvd.patch
xcdroast-0.98alpha14-dvd.patch (text/plain), 13.98 KB, created by
Andreas Proschofsky (RETIRED)
on 2003-08-10 04:30:48 UTC
(
hide
)
Description:
xcdroast-0.98alpha14-dvd.patch
Filename:
MIME Type:
Creator:
Andreas Proschofsky (RETIRED)
Created:
2003-08-10 04:30:48 UTC
Size:
13.98 KB
patch
obsolete
>--- xcdroast-0.98alpha14/src/main.c.dvd 2003-05-25 22:27:11.000000000 +0200 >+++ xcdroast-0.98alpha14/src/main.c 2003-06-17 11:52:28.000000000 +0200 >@@ -220,13 +220,8 @@ > gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0); > > side_t_btn1 = gtk_button_new_with_label (_("Setup")); >- if (!curset.isProDVD) { >- side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); >- side_t_btn3 = gtk_button_new_with_label (_("Create CD")); >- } else { > side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD/DVD")); > side_t_btn3 = gtk_button_new_with_label (_("Create CD/DVD")); >- } > side_t_btn4 = gtk_button_new_with_label (_("Exit")); > > gtk_signal_connect (GTK_OBJECT (side_t_btn1), "clicked", >@@ -540,7 +535,7 @@ > */ > > /* warn about non-existing LFS support in dvd mode */ >- if (curset.isProDVD == 1 && sizeof(off_t) != 8) { >+ if (sizeof(off_t) != 8) { > show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); > } > >--- xcdroast-0.98alpha14/src/xtools.c.dvd 2003-05-26 20:19:11.000000000 +0200 >+++ xcdroast-0.98alpha14/src/xtools.c 2003-06-17 11:52:28.000000000 +0200 >@@ -3415,7 +3415,7 @@ > isdvd = 0; > i = get_writerreaderdevs_index(devnr); > >- if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) { >+ if (i >= 0 && writerreaderdevs[i]->is_dvdwriter) { > if (convert_devnr2busid(devnr,tmp) != 0) { > g_error("non existing cdrom?"); > } >--- xcdroast-0.98alpha14/src/setup.c.dvd 2003-05-27 21:39:27.000000000 +0200 >+++ xcdroast-0.98alpha14/src/setup.c 2003-06-17 12:57:32.000000000 +0200 >@@ -295,13 +295,6 @@ > dolog(2, "Confirm setup\n"); > > /* some lasts checks and warnings */ >- if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) { >- ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); >- if (ret == 1) { >- /* abort */ >- return; >- } >- } > > /* get the writer device string */ > if (convert_devnr2busid(setupdata.writer_devnr, tmp) == 0) { >@@ -1127,11 +1120,7 @@ > gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); > gtk_widget_show(tbl); > >- if (!curset.isProDVD) { >- l1 = rightjust_gtk_label_new(_("CD Writer Device:")); >- } else { > l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); >- } > gtk_table_attach_defaults(GTK_TABLE(tbl),l1,0,15,0,1); > gtk_widget_show(l1); > >@@ -2740,11 +2729,6 @@ > gtk_text_set_point(GTK_TEXT(txt),0); > gtk_text_thaw(GTK_TEXT(txt)); > >- if (curset.isProDVD == 0) { >- gtk_widget_set_sensitive(f1, FALSE); >- gtk_widget_set_sensitive(l1, FALSE); >- gtk_widget_set_sensitive(txt, FALSE); >- } > } > > >@@ -3146,11 +3130,7 @@ > gtk_container_add (GTK_CONTAINER (f1), tbl); > gtk_widget_show(tbl); > >- if (!curset.isProDVD) { >- check = gtk_check_button_new_with_label(_("change CD Writer Device")); >- } else { > check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); >- } > gtk_signal_connect(GTK_OBJECT(check),"clicked", > GTK_SIGNAL_FUNC(root_options_selected),GINT_TO_POINTER(0)); > gtk_table_attach_defaults(GTK_TABLE(tbl),check,1,9,0,1); >@@ -3168,11 +3148,7 @@ > gtk_widget_show(check); > define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); > >- if (!curset.isProDVD) { >- check = gtk_check_button_new_with_label(_("change CD Reader Device")); >- } else { > check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); >- } > gtk_signal_connect(GTK_OBJECT(check),"clicked", > GTK_SIGNAL_FUNC(root_options_selected),GINT_TO_POINTER(2)); > gtk_table_attach_defaults(GTK_TABLE(tbl),check,1,9,1,2); >@@ -3334,11 +3310,7 @@ > gtk_widget_show(f1); > draw_scsi_scan(f1); > >- if (!curset.isProDVD) { >- l1 = gtk_label_new(_("CD Settings")); >- } else { > l1 = gtk_label_new(_("CD/DVD Settings")); >- } > f1 = gtk_frame_new(NULL); > gtk_container_set_border_width (GTK_CONTAINER (f1), 10); > gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); >--- xcdroast-0.98alpha14/src/menus.c.dvd 2003-05-29 20:47:25.000000000 +0200 >+++ xcdroast-0.98alpha14/src/menus.c 2003-06-17 11:52:28.000000000 +0200 >@@ -2603,11 +2603,7 @@ > gtk_container_set_border_width (GTK_CONTAINER (box1), 5); > gtk_container_add(GTK_CONTAINER(dialog),box1); > >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("Blank CD-RW")); >- } else { > f1 = gtk_frame_new(_("Blank CD/DVD+-RW")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_box_pack_start(GTK_BOX(box1),f1,TRUE,TRUE,0); > gtk_widget_show(f1); >@@ -2713,11 +2709,7 @@ > gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5); > gtk_widget_show(box3); > >- if (!curset.isProDVD) { >- button1 = gtk_button_new_with_label(_("Blank CD-RW")); >- } else { > button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); >- } > gtk_box_pack_start(GTK_BOX(box3),button1,TRUE,TRUE,10); > gtk_widget_show(button1); > gtk_signal_connect(GTK_OBJECT(button1),"clicked", >--- xcdroast-0.98alpha14/src/duplicate.c.dvd 2003-05-29 14:12:33.000000000 +0200 >+++ xcdroast-0.98alpha14/src/duplicate.c 2003-06-17 11:52:28.000000000 +0200 >@@ -1149,11 +1149,7 @@ > gtk_table_set_col_spacings(GTK_TABLE(tbl),10); > gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); > gtk_widget_show(tbl); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD-Information")); >- } else { > f1 = gtk_frame_new(_("CD/DVD-Information")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1); > gtk_widget_show(f1); >@@ -1710,11 +1706,7 @@ > gtk_widget_show(tbl); > vbox = gtk_vbox_new(FALSE,10); > gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD-Information")); >- } else { > f1 = gtk_frame_new(_("CD/DVD-Information")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0); > gtk_widget_show(f1); >@@ -2212,11 +2204,7 @@ > gtk_widget_show(tbl); > vbox = gtk_vbox_new(FALSE,10); > gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD-Information")); >- } else { > f1 = gtk_frame_new(_("CD/DVD-Information")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0); > gtk_widget_show(f1); >@@ -3057,11 +3045,7 @@ > gtk_table_set_col_spacings(GTK_TABLE(tbl),10); > gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); > gtk_widget_show(tbl); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD to write")); >- } else { > f1 = gtk_frame_new(_("CD/DVD to write")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1); > gtk_widget_show(f1); >@@ -3074,22 +3058,14 @@ > hbox = gtk_hbox_new(TRUE,10); > gtk_box_pack_start(GTK_BOX(actionspace),hbox,FALSE,TRUE,5); > gtk_widget_show(hbox); >- if (!curset.isProDVD) { >- b1 = gtk_button_new_with_label(_("Write CD")); >- } else { > b1 = gtk_button_new_with_label(_("Write CD/DVD")); >- } > gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10); > gtk_widget_show(b1); > gtk_signal_connect(GTK_OBJECT(b1), "clicked", > GTK_SIGNAL_FUNC(writetracks_clicked), NULL); > define_tooltip(b1,_("Writes all tracks specified by the TOC file to a CD.")); > >- if (!curset.isProDVD) { >- b1 = gtk_button_new_with_label(_("Blank CD-RW")); >- } else { > b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); >- } > gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10); > gtk_widget_show(b1); > gtk_signal_connect(GTK_OBJECT(b1), "clicked", >@@ -3206,7 +3182,6 @@ > gtk_widget_show (menu_item); > i++; > } >- if (curset.isProDVD) { > i = 0; > tmpval = curset.cdrtype; > while (dvdtypes[i] != 0) { >@@ -3230,7 +3205,6 @@ > gtk_widget_show (menu_item); > i++; > } >- } > > gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); > gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory); >@@ -3947,11 +3921,7 @@ > side_widgets[0] = b1; > define_tooltip(b1,_("Displays information about the currently inserted CD and tracks stored on the harddrive.")); > >- if (!curset.isProDVD) { >- b1 = gtk_toggle_button_new_with_label(_("Read CD")); >- } else { > b1 = gtk_toggle_button_new_with_label(_("Read CD/DVD")); >- } > gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,2,3); > gtk_widget_show(b1); > side_handlers[1] = gtk_signal_connect (GTK_OBJECT (b1), "clicked", >@@ -3959,11 +3929,7 @@ > side_widgets[1] = b1; > define_tooltip(b1,_("Reads all tracks of a CD and copy them to the harddrive.")); > >- if (!curset.isProDVD) { >- b1 = gtk_toggle_button_new_with_label(_("Verify CD")); >- } else { > b1 = gtk_toggle_button_new_with_label(_("Verify CD/DVD")); >- } > gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,3,4); > gtk_widget_show(b1); > side_handlers[2] = gtk_signal_connect (GTK_OBJECT (b1), "clicked", >@@ -3979,11 +3945,7 @@ > side_widgets[3] = b1; > define_tooltip(b1,_("Plays audio tracks (.wav files) from the harddrive via soundcard.")); > >- if (!curset.isProDVD) { >- b1 = gtk_toggle_button_new_with_label(_("Write CD")); >- } else { > b1 = gtk_toggle_button_new_with_label(_("Write CD/DVD")); >- } > gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,5,6); > gtk_widget_show(b1); > side_handlers[4] = gtk_signal_connect (GTK_OBJECT (b1), "clicked", >--- xcdroast-0.98alpha14/src/create.c.dvd 2003-05-29 14:12:15.000000000 +0200 >+++ xcdroast-0.98alpha14/src/create.c 2003-06-17 11:52:28.000000000 +0200 >@@ -508,11 +508,7 @@ > gtk_widget_show(tbl); > vbox = gtk_vbox_new(FALSE,10); > gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD-Information")); >- } else { > f1 = gtk_frame_new(_("CD/DVD-Information")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1); > gtk_widget_show(f1); >@@ -1245,11 +1241,7 @@ > gtk_widget_show(tbl); > vbox = gtk_vbox_new(FALSE,10); > gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("CD-Information")); >- } else { > f1 = gtk_frame_new(_("CD/DVD-Information")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0); > gtk_widget_show(f1); >@@ -2723,11 +2715,7 @@ > GTK_SIGNAL_FUNC(fixate_clicked), NULL); > define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated.")); > >- if (!curset.isProDVD) { >- b1 = gtk_button_new_with_label(_("Blank CD-RW")); >- } else { > b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); >- } > gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10); > gtk_widget_show(b1); > gtk_signal_connect(GTK_OBJECT(b1), "clicked", >@@ -2830,7 +2818,6 @@ > gtk_widget_show (menu_item); > i++; > } >- if (curset.isProDVD) { > i = 0; > tmpval = curset.cdrtype; > while (dvdtypes[i] != 0) { >@@ -2854,7 +2841,6 @@ > gtk_widget_show (menu_item); > i++; > } >- } > > gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); > gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory); >@@ -5722,11 +5708,7 @@ > bootable_frame1 = NULL; > bootable_frame2 = NULL; > >- if (!curset.isProDVD) { >- f1 = gtk_frame_new(_("Options to create a bootable CD")); >- } else { > f1 = gtk_frame_new(_("Options to create a bootable CD/DVD")); >- } > set_font_and_color(f1,BOLDFONT,NULL); > gtk_container_set_border_width(GTK_CONTAINER (f1),5); > gtk_box_pack_start(GTK_BOX(box),f1,TRUE,TRUE,0); >@@ -5742,11 +5724,7 @@ > gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0); > gtk_widget_show(tbl); > >- if (!curset.isProDVD) { >- l1 = rightjust_gtk_label_new(_("Make CD bootable?")); >- } else { > l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?")); >- } > gtk_table_attach_defaults(GTK_TABLE(tbl),l1,0,7,0,1); > gtk_widget_show(l1); > >@@ -6731,7 +6709,7 @@ > fill_session_available(); > /* force recalc of session size if dvd */ > /* so he will get the multisession warning */ >- if (curset.cdrtype >= 1000 && curset.isProDVD == 1 && curset.multisession == 1) { >+ if (curset.cdrtype >= 1000 && curset.multisession == 1) { > set_sessionsize_unknown(); > } > break; >@@ -6962,7 +6940,6 @@ > gtk_widget_show (menu_item); > i++; > } >- if (curset.isProDVD) { > i = 0; > tmpval = curset.cdrtype; > while (dvdtypes[i] != 0) { >@@ -6986,7 +6963,6 @@ > gtk_widget_show (menu_item); > i++; > } >- } > > gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); > gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory); >@@ -7113,11 +7089,7 @@ > gtk_widget_show(b1); > define_tooltip(b1,_("Set additional write options for advanced users.")); > /* blank button */ >- if (!curset.isProDVD) { >- b1 = gtk_button_new_with_label(_("Blank CD-RW")); >- } else { > b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); >- } > gtk_signal_connect (GTK_OBJECT (b1), "clicked", > GTK_SIGNAL_FUNC(blankcd_clicked), NULL); > gtk_table_attach_defaults(GTK_TABLE(tbl),b1,2,12,11,12); >--- xcdroast-0.98alpha14/src/io.c.dvd 2003-05-29 15:14:42.000000000 +0200 >+++ xcdroast-0.98alpha14/src/io.c 2003-06-17 11:52:28.000000000 +0200 >@@ -326,7 +326,7 @@ > gint next; > > /* skip header */ >- if (strncmp(line,"Cdrecord",8) == 0) { >+ if (strncmp(line,"Cdrecord",8) == 0 || strncmp(line,"Cdrecord",5) == 0) { > return; > } > >@@ -6326,7 +6326,7 @@ > } > > /* prodvd and beginning to write soon? */ >- if (curset.isProDVD && curset.cdrtype > 1000) { >+ if (curset.cdrtype > 1000) { > if (strstr(line,"Last chance to quit")) { > cdrtimer = gtk_timeout_add(1000, > cdrtimer_callback, NULL);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=15847">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 26323
:
15845
| 15847 |
15848
