brasero r2145 - in trunk: . docs/reference libbrasero-burn libbrasero-burn/plugins libbrasero-burn/plugins/cdrdao libbrasero-burn/plugins/cdrkit libbrasero-burn/plugins/cdrtools libbrasero-burn/plugins/checksum libbrasero-burn/plugins/dvdauthor libbrasero-burn/plugins/dvdcss libbrasero-burn/plugins/growisofs libbrasero-burn/plugins/libburnia libbrasero-burn/plugins/local-track libbrasero-burn/plugins/transcode libbrasero-burn/plugins/vcdimager libbrasero-media libbrasero-utils nautilus po src src/plugins
- From: philippr svn gnome org
- To: svn-commits-list gnome org
- Subject: brasero r2145 - in trunk: . docs/reference libbrasero-burn libbrasero-burn/plugins libbrasero-burn/plugins/cdrdao libbrasero-burn/plugins/cdrkit libbrasero-burn/plugins/cdrtools libbrasero-burn/plugins/checksum libbrasero-burn/plugins/dvdauthor libbrasero-burn/plugins/dvdcss libbrasero-burn/plugins/growisofs libbrasero-burn/plugins/libburnia libbrasero-burn/plugins/local-track libbrasero-burn/plugins/transcode libbrasero-burn/plugins/vcdimager libbrasero-media libbrasero-utils nautilus po src src/plugins
- Date: Thu, 19 Mar 2009 20:22:59 +0000 (UTC)
Author: philippr
Date: Thu Mar 19 20:22:59 2009
New Revision: 2145
URL: http://svn.gnome.org/viewvc/brasero?rev=2145&view=rev
Log:
2009-03-19 Philippe Rouquier <bonfire-app wanadoo fr>
First patch to split the backend and the application
Note: the library is still not functional outside of brasero because of
remaining undefined symbols. This problem will be addressed by following
patches.
Note2: the licence has been updated for the library to match the one in
libbrasero-media
* Makefile.am:
* configure.in:
* docs/reference/Makefile.am:
* libbrasero-burn.pc.in:
* libbrasero-burn/Makefile.am:
* libbrasero-burn/brasero-burn-dialog.c
(brasero_burn_dialog_loss_warnings_cb),
(brasero_burn_dialog_disable_joliet_cb),
(brasero_burn_dialog_dummy_success_cb), (brasero_burn_dialog_init),
(brasero_burn_dialog_notify_error),
(brasero_burn_dialog_success_run),
(brasero_burn_dialog_notify_success),
(brasero_burn_dialog_cancel_dialog):
* libbrasero-burn/brasero-burn-dialog.h:
* libbrasero-burn/brasero-burn-lib.h.in:
* libbrasero-burn/brasero-burn-options.c
(brasero_burn_options_add_burn_button),
(brasero_burn_options_init):
* libbrasero-burn/brasero-burn-options.h:
* libbrasero-burn/brasero-burn.c:
* libbrasero-burn/brasero-burn.h:
* libbrasero-burn/brasero-burn.h.in:
* libbrasero-burn/brasero-cover.c
(brasero_jacket_edit_set_audio_tracks_back),
(brasero_jacket_edit_set_audio_tracks_front),
(brasero_session_edit_cover):
* libbrasero-burn/brasero-cover.h:
* libbrasero-burn/brasero-dest-selection.c:
* libbrasero-burn/brasero-dest-selection.h:
* libbrasero-burn/brasero-disc-copy-dialog.c:
* libbrasero-burn/brasero-disc-copy-dialog.h:
* libbrasero-burn/brasero-disc-option-dialog.c
(brasero_disc_option_dialog_add_data_options),
(brasero_disc_option_dialog_get_session):
* libbrasero-burn/brasero-disc-option-dialog.h:
* libbrasero-burn/brasero-drive-properties.c:
* libbrasero-burn/brasero-drive-properties.h:
* libbrasero-burn/brasero-enums.h:
* libbrasero-burn/brasero-error.h:
* libbrasero-burn/brasero-image-option-dialog.c:
* libbrasero-burn/brasero-image-option-dialog.h:
* libbrasero-burn/brasero-image-properties.c:
* libbrasero-burn/brasero-image-properties.h:
* libbrasero-burn/brasero-image-type-chooser.c:
* libbrasero-burn/brasero-image-type-chooser.h:
* libbrasero-burn/brasero-medium-properties.c:
* libbrasero-burn/brasero-medium-properties.h:
* libbrasero-burn/brasero-progress.c:
* libbrasero-burn/brasero-progress.h:
* libbrasero-burn/brasero-session-cfg.c:
* libbrasero-burn/brasero-session-cfg.h:
* libbrasero-burn/brasero-session.c:
* libbrasero-burn/brasero-session.h:
* libbrasero-burn/brasero-src-image.c:
* libbrasero-burn/brasero-src-image.h:
* libbrasero-burn/brasero-src-selection.c:
* libbrasero-burn/brasero-src-selection.h:
* libbrasero-burn/brasero-tags.h:
* libbrasero-burn/brasero-track.c:
* libbrasero-burn/brasero-track.h:
* libbrasero-burn/brasero-tray.c:
* libbrasero-burn/brasero-tray.h:
* libbrasero-burn/burn-basics.c (brasero_burn_library_start),
(brasero_burn_library_stop):
* libbrasero-burn/burn-basics.h:
* libbrasero-burn/burn-caps.c:
* libbrasero-burn/burn-caps.h:
* libbrasero-burn/burn-dbus.c:
* libbrasero-burn/burn-dbus.h:
* libbrasero-burn/burn-debug.c:
* libbrasero-burn/burn-debug.h:
* libbrasero-burn/burn-image-format.c:
* libbrasero-burn/burn-image-format.h:
* libbrasero-burn/burn-job.c:
* libbrasero-burn/burn-job.h:
* libbrasero-burn/burn-mkisofs-base.c:
* libbrasero-burn/burn-mkisofs-base.h:
* libbrasero-burn/burn-plugin-manager.c:
* libbrasero-burn/burn-plugin-manager.h:
* libbrasero-burn/burn-plugin-private.h:
* libbrasero-burn/burn-plugin.c:
* libbrasero-burn/burn-plugin.h:
* libbrasero-burn/burn-process.c:
* libbrasero-burn/burn-process.h:
* libbrasero-burn/burn-task-ctx.c:
* libbrasero-burn/burn-task-ctx.h:
* libbrasero-burn/burn-task-item.c:
* libbrasero-burn/burn-task-item.h:
* libbrasero-burn/burn-task.c:
* libbrasero-burn/burn-task.h:
* libbrasero-burn/plugins/cdrdao/Makefile.am:
* libbrasero-burn/plugins/cdrdao/burn-cdrdao.c:
* libbrasero-burn/plugins/cdrkit/Makefile.am:
* libbrasero-burn/plugins/cdrtools/Makefile.am:
* libbrasero-burn/plugins/checksum/Makefile.am:
* libbrasero-burn/plugins/dvdauthor/Makefile.am:
* libbrasero-burn/plugins/dvdcss/Makefile.am:
* libbrasero-burn/plugins/growisofs/Makefile.am:
* libbrasero-burn/plugins/libburnia/Makefile.am:
* libbrasero-burn/plugins/local-track/Makefile.am:
* libbrasero-burn/plugins/transcode/Makefile.am:
* libbrasero-burn/plugins/transcode/burn-vob.c:
* libbrasero-burn/plugins/vcdimager/Makefile.am:
* libbrasero-burn/plugins/vcdimager/burn-vcdimager.c:
* libbrasero-media/Makefile.am:
* libbrasero-media/brasero-media.h.in:
* libbrasero-media/brasero-medium.c:
* libbrasero-utils/Makefile.am:
* libbrasero-utils/brasero-disc-message.c:
* libbrasero-utils/brasero-disc-message.h:
* libbrasero-utils/brasero-jacket-background.c:
* libbrasero-utils/brasero-jacket-background.h:
* libbrasero-utils/brasero-jacket-buffer.c:
* libbrasero-utils/brasero-jacket-buffer.h:
* libbrasero-utils/brasero-jacket-edit.c
(brasero_jacket_edit_freeze), (brasero_jacket_edit_thaw),
(brasero_jacket_edit_get_front), (brasero_jacket_edit_get_back):
* libbrasero-utils/brasero-jacket-edit.h:
* libbrasero-utils/brasero-jacket-font.c:
* libbrasero-utils/brasero-jacket-font.h:
* libbrasero-utils/brasero-jacket-view.c:
* libbrasero-utils/brasero-jacket-view.h:
* libbrasero-utils/brasero-misc.c:
* libbrasero-utils/brasero-misc.h:
* libbrasero-utils/brasero-notify.c:
* libbrasero-utils/brasero-notify.h:
* libbrasero-utils/brasero-tool-color-picker.c:
* libbrasero-utils/brasero-tool-color-picker.h:
* nautilus/nautilus-burn-extension.c (launch_brasero_on_window),
(write_iso_activate_cb), (copy_disc_activate_cb),
(blank_disc_activate_cb), (check_disc_activate_cb):
* src/Makefile.am:
* src/brasero-app.c:
* src/brasero-app.h:
* src/brasero-blank-dialog.c:
* src/brasero-burn-dialog.c:
* src/brasero-burn-dialog.h:
* src/brasero-burn-options.c:
* src/brasero-burn-options.h:
* src/brasero-data-disc.c:
* src/brasero-data-project.h:
* src/brasero-data-tree-model.c:
* src/brasero-dest-selection.c:
* src/brasero-dest-selection.h:
* src/brasero-disc-copy-dialog.c:
* src/brasero-disc-copy-dialog.h:
* src/brasero-disc-message.c:
* src/brasero-disc-message.h:
* src/brasero-disc-option-dialog.c:
* src/brasero-disc-option-dialog.h:
* src/brasero-disc.c:
* src/brasero-disc.h:
* src/brasero-drive-properties.c:
* src/brasero-drive-properties.h:
* src/brasero-eject-dialog.c:
* src/brasero-file-monitor.c (brasero_file_monitor_single_file):
* src/brasero-filter-option.c:
* src/brasero-image-option-dialog.c:
* src/brasero-image-option-dialog.h:
* src/brasero-image-properties.c:
* src/brasero-image-properties.h:
* src/brasero-image-type-chooser.c:
* src/brasero-image-type-chooser.h:
* src/brasero-jacket-background.c:
* src/brasero-jacket-background.h:
* src/brasero-jacket-buffer.c:
* src/brasero-jacket-buffer.h:
* src/brasero-jacket-edit.c:
* src/brasero-jacket-edit.h:
* src/brasero-jacket-font.c:
* src/brasero-jacket-font.h:
* src/brasero-jacket-view.c:
* src/brasero-jacket-view.h:
* src/brasero-medium-properties.c:
* src/brasero-medium-properties.h:
* src/brasero-multi-song-props.c:
* src/brasero-notify.c:
* src/brasero-notify.h:
* src/brasero-plugin-manager-ui.c:
* src/brasero-progress.c:
* src/brasero-progress.h:
* src/brasero-project-manager.c
(brasero_project_manager_new_cover_cb):
* src/brasero-project-parse.h:
* src/brasero-project-type-chooser.c:
* src/brasero-project.c (brasero_project_setup_session),
(brasero_project_burn), (brasero_project_create_audio_cover):
* src/brasero-project.h:
* src/brasero-search-beagle.c:
* src/brasero-session-cfg.c:
* src/brasero-session-cfg.h:
* src/brasero-session.c:
* src/brasero-session.h:
* src/brasero-song-properties.c:
* src/brasero-split-dialog.c:
* src/brasero-src-image.c:
* src/brasero-src-image.h:
* src/brasero-src-selection.c:
* src/brasero-src-selection.h:
* src/brasero-sum-dialog.c:
* src/brasero-tool-color-picker.c:
* src/brasero-tool-color-picker.h:
* src/brasero-tool-dialog.c:
* src/brasero-tool-dialog.h:
* src/brasero-tray.c:
* src/brasero-tray.h:
* src/brasero-utils.c (brasero_error_quark), (brasero_utils_init),
(brasero_utils_launch_app):
* src/brasero-utils.h:
* src/brasero-video-project.h:
* src/burn-basics.c:
* src/burn-basics.h:
* src/burn-caps.c:
* src/burn-caps.h:
* src/burn-dbus.c:
* src/burn-dbus.h:
* src/burn-debug.c:
* src/burn-debug.h:
* src/burn-image-format.c:
* src/burn-image-format.h:
* src/burn-job.c:
* src/burn-job.h:
* src/burn-mkisofs-base.c:
* src/burn-mkisofs-base.h:
* src/burn-plugin-manager.c:
* src/burn-plugin-manager.h:
* src/burn-plugin-private.h:
* src/burn-plugin.c:
* src/burn-plugin.h:
* src/burn-process.c:
* src/burn-process.h:
* src/burn-session.c:
* src/burn-session.h:
* src/burn-task-ctx.c:
* src/burn-task-ctx.h:
* src/burn-task-item.c:
* src/burn-task-item.h:
* src/burn-task.c:
* src/burn-task.h:
* src/burn-track.c:
* src/burn-track.h:
* src/burn.c:
* src/burn.h:
* src/eggdesktopfile.c:
* src/eggdesktopfile.h:
* src/eggsmclient-private.h:
* src/eggsmclient-xsmp.c:
* src/eggsmclient.c:
* src/eggsmclient.h:
* src/main.c (main):
* src/plugins/Makefile.am:
* src/plugins/cdrdao/Makefile.am:
* src/plugins/cdrdao/burn-cdrdao-common.h:
* src/plugins/cdrdao/burn-cdrdao.c:
* src/plugins/cdrdao/burn-cdrdao.h:
* src/plugins/cdrdao/burn-toc2cue.c:
* src/plugins/cdrdao/burn-toc2cue.h:
* src/plugins/cdrkit/Makefile.am:
* src/plugins/cdrkit/burn-cdrkit.h:
* src/plugins/cdrkit/burn-genisoimage.c:
* src/plugins/cdrkit/burn-genisoimage.h:
* src/plugins/cdrkit/burn-readom.c:
* src/plugins/cdrkit/burn-readom.h:
* src/plugins/cdrkit/burn-wodim.c:
* src/plugins/cdrkit/burn-wodim.h:
* src/plugins/cdrtools/Makefile.am:
* src/plugins/cdrtools/burn-cdrecord.c:
* src/plugins/cdrtools/burn-cdrecord.h:
* src/plugins/cdrtools/burn-cdrtools.h:
* src/plugins/cdrtools/burn-mkisofs.c:
* src/plugins/cdrtools/burn-mkisofs.h:
* src/plugins/cdrtools/burn-readcd.c:
* src/plugins/cdrtools/burn-readcd.h:
* src/plugins/checksum/Makefile.am:
* src/plugins/checksum/burn-checksum-files.c:
* src/plugins/checksum/burn-checksum-files.h:
* src/plugins/checksum/burn-checksum-image.c:
* src/plugins/checksum/burn-checksum-image.h:
* src/plugins/checksum/burn-volume-read.c:
* src/plugins/checksum/burn-volume-read.h:
* src/plugins/dvdauthor/Makefile.am:
* src/plugins/dvdauthor/burn-dvdauthor.c:
* src/plugins/dvdauthor/burn-dvdauthor.h:
* src/plugins/dvdcss/Makefile.am:
* src/plugins/dvdcss/burn-dvdcss-private.h:
* src/plugins/dvdcss/burn-dvdcss.c:
* src/plugins/dvdcss/burn-dvdcss.h:
* src/plugins/growisofs/Makefile.am:
* src/plugins/growisofs/burn-dvd-rw-format.c:
* src/plugins/growisofs/burn-dvd-rw-format.h:
* src/plugins/growisofs/burn-growisofs-common.h:
* src/plugins/growisofs/burn-growisofs.c:
* src/plugins/growisofs/burn-growisofs.h:
* src/plugins/libburnia/Makefile.am:
* src/plugins/libburnia/burn-libburn-common.c:
* src/plugins/libburnia/burn-libburn-common.h:
* src/plugins/libburnia/burn-libburn.c:
* src/plugins/libburnia/burn-libburn.h:
* src/plugins/libburnia/burn-libburnia.h:
* src/plugins/libburnia/burn-libisofs.c:
* src/plugins/libburnia/burn-libisofs.h:
* src/plugins/libburnia/burn-libread-disc.h:
* src/plugins/local-track/Makefile.am:
* src/plugins/local-track/burn-local-image.c:
* src/plugins/local-track/burn-local-image.h:
* src/plugins/local-track/burn-uri.c:
* src/plugins/local-track/burn-uri.h:
* src/plugins/transcode/Makefile.am:
* src/plugins/transcode/burn-normalize.c:
* src/plugins/transcode/burn-normalize.h:
* src/plugins/transcode/burn-transcode.c:
* src/plugins/transcode/burn-transcode.h:
* src/plugins/transcode/burn-vob.c:
* src/plugins/transcode/burn-vob.h:
* src/plugins/vcdimager/Makefile.am:
* src/plugins/vcdimager/burn-vcdimager.c:
* src/plugins/vcdimager/burn-vcdimager.h:
Added:
trunk/libbrasero-burn/
trunk/libbrasero-burn.pc.in
trunk/libbrasero-burn/Makefile.am
trunk/libbrasero-burn/brasero-burn-dialog.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-burn-dialog.c
trunk/libbrasero-burn/brasero-burn-dialog.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-burn-dialog.h
trunk/libbrasero-burn/brasero-burn-lib.h.in
trunk/libbrasero-burn/brasero-burn-options.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-burn-options.c
trunk/libbrasero-burn/brasero-burn-options.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-burn-options.h
trunk/libbrasero-burn/brasero-burn.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn.c
trunk/libbrasero-burn/brasero-burn.h
trunk/libbrasero-burn/brasero-burn.h.in (contents, props changed)
- copied, changed from r2117, /trunk/src/burn.h
trunk/libbrasero-burn/brasero-cover.c
trunk/libbrasero-burn/brasero-cover.h
trunk/libbrasero-burn/brasero-dest-selection.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-dest-selection.c
trunk/libbrasero-burn/brasero-dest-selection.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-dest-selection.h
trunk/libbrasero-burn/brasero-disc-copy-dialog.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-copy-dialog.c
trunk/libbrasero-burn/brasero-disc-copy-dialog.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-copy-dialog.h
trunk/libbrasero-burn/brasero-disc-option-dialog.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-option-dialog.c
trunk/libbrasero-burn/brasero-disc-option-dialog.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-option-dialog.h
trunk/libbrasero-burn/brasero-drive-properties.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-drive-properties.c
trunk/libbrasero-burn/brasero-drive-properties.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-drive-properties.h
trunk/libbrasero-burn/brasero-enums.h
trunk/libbrasero-burn/brasero-error.h
trunk/libbrasero-burn/brasero-image-option-dialog.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-option-dialog.c
trunk/libbrasero-burn/brasero-image-option-dialog.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-option-dialog.h
trunk/libbrasero-burn/brasero-image-properties.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-properties.c
trunk/libbrasero-burn/brasero-image-properties.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-properties.h
trunk/libbrasero-burn/brasero-image-type-chooser.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-type-chooser.c
trunk/libbrasero-burn/brasero-image-type-chooser.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-image-type-chooser.h
trunk/libbrasero-burn/brasero-medium-properties.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-medium-properties.c
trunk/libbrasero-burn/brasero-medium-properties.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-medium-properties.h
trunk/libbrasero-burn/brasero-progress.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-progress.c
trunk/libbrasero-burn/brasero-progress.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-progress.h
trunk/libbrasero-burn/brasero-session-cfg.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-session-cfg.c
trunk/libbrasero-burn/brasero-session-cfg.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-session-cfg.h
trunk/libbrasero-burn/brasero-session.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-session.c
trunk/libbrasero-burn/brasero-session.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-session.h
trunk/libbrasero-burn/brasero-src-image.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-src-image.c
trunk/libbrasero-burn/brasero-src-image.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-src-image.h
trunk/libbrasero-burn/brasero-src-selection.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-src-selection.c
trunk/libbrasero-burn/brasero-src-selection.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-src-selection.h
trunk/libbrasero-burn/brasero-tags.h
trunk/libbrasero-burn/brasero-track.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-track.c
trunk/libbrasero-burn/brasero-track.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-track.h
trunk/libbrasero-burn/brasero-tray.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-tray.c
trunk/libbrasero-burn/brasero-tray.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-tray.h
trunk/libbrasero-burn/burn-basics.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-basics.c
trunk/libbrasero-burn/burn-basics.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-basics.h
trunk/libbrasero-burn/burn-caps.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-caps.c
trunk/libbrasero-burn/burn-caps.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-caps.h
trunk/libbrasero-burn/burn-dbus.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-dbus.c
trunk/libbrasero-burn/burn-dbus.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-dbus.h
trunk/libbrasero-burn/burn-debug.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-debug.c
trunk/libbrasero-burn/burn-debug.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-debug.h
trunk/libbrasero-burn/burn-image-format.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-image-format.c
trunk/libbrasero-burn/burn-image-format.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-image-format.h
trunk/libbrasero-burn/burn-job.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-job.c
trunk/libbrasero-burn/burn-job.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-job.h
trunk/libbrasero-burn/burn-mkisofs-base.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-mkisofs-base.c
trunk/libbrasero-burn/burn-mkisofs-base.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-mkisofs-base.h
trunk/libbrasero-burn/burn-plugin-manager.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-plugin-manager.c
trunk/libbrasero-burn/burn-plugin-manager.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-plugin-manager.h
trunk/libbrasero-burn/burn-plugin-private.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-plugin-private.h
trunk/libbrasero-burn/burn-plugin.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-plugin.c
trunk/libbrasero-burn/burn-plugin.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-plugin.h
trunk/libbrasero-burn/burn-process.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-process.c
trunk/libbrasero-burn/burn-process.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-process.h
trunk/libbrasero-burn/burn-task-ctx.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task-ctx.c
trunk/libbrasero-burn/burn-task-ctx.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task-ctx.h
trunk/libbrasero-burn/burn-task-item.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task-item.c
trunk/libbrasero-burn/burn-task-item.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task-item.h
trunk/libbrasero-burn/burn-task.c (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task.c
trunk/libbrasero-burn/burn-task.h (contents, props changed)
- copied, changed from r2117, /trunk/src/burn-task.h
trunk/libbrasero-burn/plugins/ (props changed)
- copied from r2117, /trunk/src/plugins/
trunk/libbrasero-utils/
trunk/libbrasero-utils/Makefile.am
trunk/libbrasero-utils/brasero-disc-message.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-message.c
trunk/libbrasero-utils/brasero-disc-message.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-disc-message.h
trunk/libbrasero-utils/brasero-jacket-background.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-background.c
trunk/libbrasero-utils/brasero-jacket-background.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-background.h
trunk/libbrasero-utils/brasero-jacket-buffer.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-buffer.c
trunk/libbrasero-utils/brasero-jacket-buffer.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-buffer.h
trunk/libbrasero-utils/brasero-jacket-edit.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-edit.c
trunk/libbrasero-utils/brasero-jacket-edit.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-edit.h
trunk/libbrasero-utils/brasero-jacket-font.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-font.c
trunk/libbrasero-utils/brasero-jacket-font.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-font.h
trunk/libbrasero-utils/brasero-jacket-view.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-view.c
trunk/libbrasero-utils/brasero-jacket-view.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-jacket-view.h
trunk/libbrasero-utils/brasero-misc.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-utils.c
trunk/libbrasero-utils/brasero-misc.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-utils.h
trunk/libbrasero-utils/brasero-notify.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-notify.c
trunk/libbrasero-utils/brasero-notify.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-notify.h
trunk/libbrasero-utils/brasero-tool-color-picker.c (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-tool-color-picker.c
trunk/libbrasero-utils/brasero-tool-color-picker.h (contents, props changed)
- copied, changed from r2117, /trunk/src/brasero-tool-color-picker.h
trunk/libbrasero-utils/eggdesktopfile.c (props changed)
- copied unchanged from r2117, /trunk/src/eggdesktopfile.c
trunk/libbrasero-utils/eggdesktopfile.h (props changed)
- copied unchanged from r2117, /trunk/src/eggdesktopfile.h
trunk/libbrasero-utils/eggsmclient-private.h (props changed)
- copied unchanged from r2117, /trunk/src/eggsmclient-private.h
trunk/libbrasero-utils/eggsmclient-xsmp.c (props changed)
- copied unchanged from r2117, /trunk/src/eggsmclient-xsmp.c
trunk/libbrasero-utils/eggsmclient.c (props changed)
- copied unchanged from r2117, /trunk/src/eggsmclient.c
trunk/libbrasero-utils/eggsmclient.h (props changed)
- copied unchanged from r2117, /trunk/src/eggsmclient.h
trunk/src/brasero-xsession.c (props changed)
- copied unchanged from r2117, /trunk/src/brasero-session.c
trunk/src/brasero-xsession.h (props changed)
- copied unchanged from r2117, /trunk/src/brasero-session.h
Removed:
trunk/src/brasero-burn-dialog.c
trunk/src/brasero-burn-dialog.h
trunk/src/brasero-burn-options.c
trunk/src/brasero-burn-options.h
trunk/src/brasero-dest-selection.c
trunk/src/brasero-dest-selection.h
trunk/src/brasero-disc-copy-dialog.c
trunk/src/brasero-disc-copy-dialog.h
trunk/src/brasero-disc-message.c
trunk/src/brasero-disc-message.h
trunk/src/brasero-disc-option-dialog.c
trunk/src/brasero-disc-option-dialog.h
trunk/src/brasero-drive-properties.c
trunk/src/brasero-drive-properties.h
trunk/src/brasero-image-option-dialog.c
trunk/src/brasero-image-option-dialog.h
trunk/src/brasero-image-properties.c
trunk/src/brasero-image-properties.h
trunk/src/brasero-image-type-chooser.c
trunk/src/brasero-image-type-chooser.h
trunk/src/brasero-jacket-background.c
trunk/src/brasero-jacket-background.h
trunk/src/brasero-jacket-buffer.c
trunk/src/brasero-jacket-buffer.h
trunk/src/brasero-jacket-edit.c
trunk/src/brasero-jacket-edit.h
trunk/src/brasero-jacket-font.c
trunk/src/brasero-jacket-font.h
trunk/src/brasero-jacket-view.c
trunk/src/brasero-jacket-view.h
trunk/src/brasero-medium-properties.c
trunk/src/brasero-medium-properties.h
trunk/src/brasero-notify.c
trunk/src/brasero-notify.h
trunk/src/brasero-progress.c
trunk/src/brasero-progress.h
trunk/src/brasero-session-cfg.c
trunk/src/brasero-session-cfg.h
trunk/src/brasero-session.c
trunk/src/brasero-session.h
trunk/src/brasero-src-image.c
trunk/src/brasero-src-image.h
trunk/src/brasero-src-selection.c
trunk/src/brasero-src-selection.h
trunk/src/brasero-tool-color-picker.c
trunk/src/brasero-tool-color-picker.h
trunk/src/brasero-tray.c
trunk/src/brasero-tray.h
trunk/src/burn-basics.c
trunk/src/burn-basics.h
trunk/src/burn-caps.c
trunk/src/burn-caps.h
trunk/src/burn-dbus.c
trunk/src/burn-dbus.h
trunk/src/burn-debug.c
trunk/src/burn-debug.h
trunk/src/burn-image-format.c
trunk/src/burn-image-format.h
trunk/src/burn-job.c
trunk/src/burn-job.h
trunk/src/burn-mkisofs-base.c
trunk/src/burn-mkisofs-base.h
trunk/src/burn-plugin-manager.c
trunk/src/burn-plugin-manager.h
trunk/src/burn-plugin-private.h
trunk/src/burn-plugin.c
trunk/src/burn-plugin.h
trunk/src/burn-process.c
trunk/src/burn-process.h
trunk/src/burn-session.c
trunk/src/burn-session.h
trunk/src/burn-task-ctx.c
trunk/src/burn-task-ctx.h
trunk/src/burn-task-item.c
trunk/src/burn-task-item.h
trunk/src/burn-task.c
trunk/src/burn-task.h
trunk/src/burn-track.c
trunk/src/burn-track.h
trunk/src/burn.c
trunk/src/burn.h
trunk/src/eggdesktopfile.c
trunk/src/eggdesktopfile.h
trunk/src/eggsmclient-private.h
trunk/src/eggsmclient-xsmp.c
trunk/src/eggsmclient.c
trunk/src/eggsmclient.h
trunk/src/plugins/
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.in
trunk/docs/reference/Makefile.am
trunk/libbrasero-burn/plugins/cdrdao/Makefile.am
trunk/libbrasero-burn/plugins/cdrdao/burn-cdrdao.c
trunk/libbrasero-burn/plugins/cdrkit/Makefile.am
trunk/libbrasero-burn/plugins/cdrtools/Makefile.am
trunk/libbrasero-burn/plugins/checksum/Makefile.am
trunk/libbrasero-burn/plugins/dvdauthor/Makefile.am
trunk/libbrasero-burn/plugins/dvdcss/Makefile.am
trunk/libbrasero-burn/plugins/growisofs/Makefile.am
trunk/libbrasero-burn/plugins/libburnia/Makefile.am
trunk/libbrasero-burn/plugins/local-track/Makefile.am
trunk/libbrasero-burn/plugins/transcode/Makefile.am
trunk/libbrasero-burn/plugins/transcode/burn-vob.c
trunk/libbrasero-burn/plugins/vcdimager/Makefile.am
trunk/libbrasero-burn/plugins/vcdimager/burn-vcdimager.c
trunk/libbrasero-media/Makefile.am
trunk/libbrasero-media/brasero-media.h.in
trunk/libbrasero-media/brasero-medium.c
trunk/nautilus/nautilus-burn-extension.c
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/src/Makefile.am
trunk/src/brasero-app.c
trunk/src/brasero-app.h
trunk/src/brasero-blank-dialog.c
trunk/src/brasero-data-disc.c
trunk/src/brasero-data-project.h
trunk/src/brasero-data-tree-model.c
trunk/src/brasero-disc.c
trunk/src/brasero-disc.h
trunk/src/brasero-eject-dialog.c
trunk/src/brasero-file-monitor.c
trunk/src/brasero-filter-option.c
trunk/src/brasero-multi-song-props.c
trunk/src/brasero-plugin-manager-ui.c
trunk/src/brasero-project-manager.c
trunk/src/brasero-project-parse.h
trunk/src/brasero-project-type-chooser.c
trunk/src/brasero-project.c
trunk/src/brasero-project.h
trunk/src/brasero-search-beagle.c
trunk/src/brasero-song-properties.c
trunk/src/brasero-split-dialog.c
trunk/src/brasero-sum-dialog.c
trunk/src/brasero-tool-dialog.c
trunk/src/brasero-tool-dialog.h
trunk/src/brasero-video-project.h
trunk/src/main.c
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Mar 19 20:22:59 2009
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in.
-SUBDIRS = libbrasero-media src po data docs
-
-SUBDIRS += help
+SUBDIRS = libbrasero-utils libbrasero-media libbrasero-burn src po data docs help
if BUILD_NAUTILUS
SUBDIRS += nautilus
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Mar 19 20:22:59 2009
@@ -405,6 +405,7 @@
AC_OUTPUT([
Makefile
libbrasero-media.pc
+libbrasero-burn.pc
docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
@@ -420,18 +421,21 @@
nautilus/brasero-nautilus.desktop.in
libbrasero-media/Makefile
libbrasero-media/brasero-media.h
-src/plugins/Makefile
-src/plugins/cdrdao/Makefile
-src/plugins/cdrkit/Makefile
-src/plugins/cdrtools/Makefile
-src/plugins/growisofs/Makefile
-src/plugins/libburnia/Makefile
-src/plugins/transcode/Makefile
-src/plugins/dvdcss/Makefile
-src/plugins/dvdauthor/Makefile
-src/plugins/checksum/Makefile
-src/plugins/local-track/Makefile
-src/plugins/vcdimager/Makefile
+libbrasero-utils/Makefile
+libbrasero-burn/Makefile
+libbrasero-burn/brasero-burn-lib.h
+libbrasero-burn/plugins/Makefile
+libbrasero-burn/plugins/cdrdao/Makefile
+libbrasero-burn/plugins/cdrkit/Makefile
+libbrasero-burn/plugins/cdrtools/Makefile
+libbrasero-burn/plugins/growisofs/Makefile
+libbrasero-burn/plugins/libburnia/Makefile
+libbrasero-burn/plugins/transcode/Makefile
+libbrasero-burn/plugins/dvdcss/Makefile
+libbrasero-burn/plugins/dvdauthor/Makefile
+libbrasero-burn/plugins/checksum/Makefile
+libbrasero-burn/plugins/local-track/Makefile
+libbrasero-burn/plugins/vcdimager/Makefile
po/Makefile.in
src/Makefile
])
Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am (original)
+++ trunk/docs/reference/Makefile.am Thu Mar 19 20:22:59 2009
@@ -42,8 +42,8 @@
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h
-CFILE_GLOB=$(top_srcdir)/libbrasero-media/*.c
+HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h #$(top_srcdir)/libbrasero-burn/*.h
+CFILE_GLOB=$(top_srcdir)/libbrasero-media/*.c #$(top_srcdir)/libbrasero-burn/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -83,7 +83,48 @@
burn-susp.h \
burn-hal-watch.h \
libbrasero-marshal.h \
- brasero-gio-operation.h
+ brasero-gio-operation.h \
+ brasero-burn-dialog.h \
+ brasero-disc-message.h \
+ brasero-image-properties.h \
+ brasero-jacket-view.h \
+ brasero-src-image.h \
+ burn-caps.h \
+ burn-plugin.h \
+ burn-task-item.h \
+ brasero-burn.h \
+ brasero-disc-option-dialog.h \
+ brasero-image-type-chooser.h \
+ brasero-medium-properties.h \
+ brasero-src-selection.h \
+ burn-dbus.h \
+ burn-plugin-manager.h \
+ brasero-burn-lib.h \
+ brasero-drive-properties.h \
+ brasero-jacket-background.h \
+ brasero-notify.h \
+ brasero-tags.h \
+ burn-debug.h \
+ burn-plugin-private.h \
+ brasero-burn-options.h \
+ brasero-jacket-buffer.h \
+ brasero-progress.h \
+ brasero-track.h \
+ burn-image-format.h \
+ burn-process.h \
+ brasero-dest-selection.h \
+ brasero-jacket-edit.h \
+ brasero-session-cfg.h \
+ brasero-tray.h \
+ burn-job.h \
+ burn-task-ctx.h \
+ brasero-disc-copy-dialog.h \
+ brasero-image-option-dialog.h \
+ brasero-jacket-font.h \
+ brasero-session.h \
+ burn-basics.h \
+ burn-mkisofs-base.h \
+ burn-task.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
@@ -112,7 +153,8 @@
$(BRASERO_DBUS_CFLAGS) \
$(BRASERO_HAL_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la
+GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la
+#$(top_builddir)/libbrasero-burn/libbrasero-burn.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
Added: trunk/libbrasero-burn.pc.in
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn.pc.in Thu Mar 19 20:22:59 2009
@@ -0,0 +1,13 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+gconf_serverdir= libexecdir@
+
+
+Name: libbrasero-burn
+Description: Brasero Optical Media Burning library
+Version: @VERSION@
+Requires: glib-2.0 gthread-2.0 gtk+-2.0 dbus-glib-1
+Libs: -L${libdir} -lbrasero-burn
+Cflags: -I${includedir}/brasero/
Added: trunk/libbrasero-burn/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/Makefile.am Thu Mar 19 20:22:59 2009
@@ -0,0 +1,137 @@
+SUBDIRS = plugins
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src/ \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/libbrasero-utils/ \
+ -I$(top_builddir)/libbrasero-utils/ \
+ -I$(top_srcdir)/libbrasero-media/ \
+ -I$(top_builddir)/libbrasero-media/ \
+ -DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+ -DBRASERO_LIBDIR=\"$(libdir)\" \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GMODULE_CFLAGS) \
+ $(BRASERO_GCONF_CFLAGS) \
+ $(BRASERO_GLIB_CFLAGS) \
+ $(BRASERO_GIO_CFLAGS) \
+ $(BRASERO_GTK_CFLAGS) \
+ $(BRASERO_DBUS_CFLAGS)
+
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+RECMARSHALFILES = libbrasero-marshal.h libbrasero-marshal.c
+
+libbrasero-marshal.h: libbrasero-marshal.list
+ ( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --header > libbrasero-marshal.h )
+libbrasero-marshal.c: libbrasero-marshal.h
+ ( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --body --header > libbrasero-marshal.c )
+
+lib_LTLIBRARIES = \
+ libbrasero-burn.la
+
+libbraseroburnincludedir = $(pkgincludedir)/
+libbraseroburninclude_HEADERS = \
+ brasero-tags.h \
+ brasero-enums.h \
+ brasero-error.h \
+ brasero-burn-lib.h
+
+libbrasero_burn_la_LIBADD = \
+ ../libbrasero-media/libbrasero-media.la \
+ ../libbrasero-utils/libbrasero-utils.la \
+ $(BRASERO_GLIB_LIBS) \
+ $(BRASERO_GMODULE_LIBS) \
+ $(BRASERO_GIO_LIBS) \
+ $(BRASERO_GCONF_LIBS) \
+ $(BRASERO_GTK_LIBS) \
+ $(BRASERO_DBUS_LIBS)
+
+libbrasero_burn_la_LDFLAGS = \
+ -version-info $(LIBBRASERO_LT_VERSION) \
+ -no-undefined \
+ $(AM_LDFLAGS)
+# -export-symbols ./libbrasero-burn.symbols
+
+libbrasero_burn_la_SOURCES = \
+ libbrasero-marshal.c \
+ libbrasero-marshal.h \
+ brasero-burn.c \
+ brasero-burn.h \
+ burn-basics.h \
+ burn-caps.h \
+ burn-dbus.h \
+ burn-debug.h \
+ burn-image-format.h \
+ burn-job.h \
+ burn-mkisofs-base.h \
+ burn-plugin.h \
+ burn-plugin-manager.h \
+ burn-plugin-private.h \
+ burn-process.h \
+ brasero-session.h \
+ burn-task.h \
+ burn-task-ctx.h \
+ burn-task-item.h \
+ brasero-track.h \
+ brasero-session.c \
+ brasero-track.c \
+ burn-basics.c \
+ burn-caps.c \
+ burn-dbus.c \
+ burn-debug.c \
+ burn-image-format.c \
+ burn-job.c \
+ burn-mkisofs-base.c \
+ burn-plugin.c \
+ burn-plugin-manager.c \
+ burn-process.c \
+ burn-task.c \
+ burn-task-ctx.c \
+ burn-task-item.c \
+ brasero-burn-dialog.c \
+ brasero-burn-dialog.h \
+ brasero-burn-options.c \
+ brasero-burn-options.h \
+ brasero-dest-selection.c \
+ brasero-dest-selection.h \
+ brasero-disc-copy-dialog.c \
+ brasero-disc-copy-dialog.h \
+ brasero-disc-option-dialog.c \
+ brasero-disc-option-dialog.h \
+ brasero-drive-properties.c \
+ brasero-drive-properties.h \
+ brasero-image-option-dialog.c \
+ brasero-image-option-dialog.h \
+ brasero-image-properties.c \
+ brasero-image-properties.h \
+ brasero-image-type-chooser.c \
+ brasero-image-type-chooser.h \
+ brasero-medium-properties.c \
+ brasero-medium-properties.h \
+ brasero-progress.c \
+ brasero-progress.h \
+ brasero-session-cfg.c \
+ brasero-session-cfg.h \
+ brasero-src-image.c \
+ brasero-src-image.h \
+ brasero-src-selection.c \
+ brasero-src-selection.h \
+ brasero-tray.c \
+ brasero-tray.h \
+ brasero-burn-lib.h \
+ brasero-error.h \
+ brasero-enums.h \
+ brasero-tags.h \
+ brasero-cover.c \
+ brasero-cover.h
+
+EXTRA_DIST = \
+ libbrasero-marshal.list
+# libbrasero-burn.symbols
+
+CLEANFILES = \
+ $(RECMARSHALFILES)
+
Copied: trunk/libbrasero-burn/brasero-burn-dialog.c (from r2117, /trunk/src/brasero-burn-dialog.c)
==============================================================================
--- /trunk/src/brasero-burn-dialog.c (original)
+++ trunk/libbrasero-burn/brasero-burn-dialog.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-dialog.c
- *
- * mer jun 29 13:05:45 2005
- * Copyright 2005 Philippe Rouquier
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -40,20 +44,22 @@
#include <gtk/gtk.h>
-#include "brasero-utils.h"
-#include "brasero-disc.h"
#include "brasero-tray.h"
#include "brasero-burn-dialog.h"
-#include "brasero-jacket-edit.h"
#include "brasero-session-cfg.h"
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-session.h"
+
+#include "brasero-tags.h"
+#include "brasero-session.h"
#include "brasero-medium.h"
#include "brasero-progress.h"
#include "brasero-drive.h"
+#include "brasero-misc.h"
+
+
static void brasero_burn_dialog_class_init (BraseroBurnDialogClass *klass);
static void brasero_burn_dialog_init (BraseroBurnDialog *obj);
static void brasero_burn_dialog_finalize (GObject *object);
@@ -791,25 +797,22 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
"%s", secondary_message);
- button = brasero_utils_make_button (_("_Replace Disc"),
- GTK_STOCK_REFRESH,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message),
- button, GTK_RESPONSE_ACCEPT);
-
- gtk_dialog_add_buttons (GTK_DIALOG (message),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
-
- button = brasero_utils_make_button (button_text,
- NULL,
- button_icon,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message),
- button, GTK_RESPONSE_OK);
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("_Replace Disc"),
+ GTK_RESPONSE_ACCEPT);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_REFRESH,
+ GTK_ICON_SIZE_BUTTON));
+
+ gtk_dialog_add_button (GTK_DIALOG (message),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ button_text,
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_icon_name (button_icon,
+ GTK_ICON_SIZE_BUTTON));
result = gtk_dialog_run (GTK_DIALOG (message));
gtk_widget_destroy (message);
@@ -927,18 +930,16 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Some files don't have a suitable name for a fully Windows-compatible CD."));
- gtk_dialog_add_buttons (GTK_DIALOG (message),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
-
- button = brasero_utils_make_button (_("_Continue"),
- GTK_STOCK_OK,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message),
- button, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (message),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("_Continue"),
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_OK,
+ GTK_ICON_SIZE_BUTTON));
+
result = gtk_dialog_run (GTK_DIALOG (message));
gtk_widget_destroy (message);
@@ -1186,13 +1187,12 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Real disc burning will take place in 10 seconds."));
- button = brasero_utils_make_button (_("Burn _Now"),
- NULL,
- "media-optical-burn",
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_OK);
-
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("Burn _Now"),
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_icon_name ("media-optical-burn",
+ GTK_ICON_SIZE_BUTTON));
id = g_timeout_add_seconds (10,
brasero_burn_dialog_dummy_success_timeout,
message);
@@ -1282,11 +1282,9 @@
0);
/* buttons */
- obj->priv->cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- gtk_widget_show (obj->priv->cancel);
- gtk_dialog_add_action_widget (GTK_DIALOG (obj),
- obj->priv->cancel,
- GTK_RESPONSE_CANCEL);
+ obj->priv->cancel = gtk_dialog_add_button (GTK_DIALOG (obj),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
}
static void
@@ -1710,23 +1708,23 @@
secondary);
g_free (secondary);
- button = brasero_utils_make_button (_("_Save Log"),
- GTK_STOCK_SAVE_AS,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_APPLY);
-
- button = brasero_utils_make_button (_("_View Log"),
- GTK_STOCK_EDIT,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_OK);
-
- button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_widget_show (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_CLOSE);
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("_Save Log"),
+ GTK_RESPONSE_APPLY);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_SAVE_AS,
+ GTK_ICON_SIZE_BUTTON));
+
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("_View Log"),
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_SAVE_AS,
+ GTK_ICON_SIZE_BUTTON));
+
+ gtk_dialog_add_button (GTK_DIALOG (message),
+ GTK_STOCK_CLOSE,
+ GTK_RESPONSE_CLOSE);
response = gtk_dialog_run (GTK_DIALOG (message));
while (1) {
@@ -1750,27 +1748,9 @@
answer = gtk_dialog_run (GTK_DIALOG (dialog));
if (answer == GTK_RESPONSE_CLOSE) {
- BraseroJacketEdit *contents;
- GValue *cover_value;
- const gchar *title;
GtkWidget *window;
- GSList *tracks;
-
- window = brasero_jacket_edit_dialog_new (GTK_WIDGET (dialog), &contents);
-
- title = brasero_burn_session_get_label (dialog->priv->session);
- tracks = brasero_burn_session_get_tracks (dialog->priv->session);
-
- cover_value = NULL;
- brasero_burn_session_tag_lookup (dialog->priv->session,
- BRASERO_COVER_URI,
- &cover_value);
-
- brasero_jacket_edit_set_audio_tracks (contents,
- title,
- cover_value? g_value_get_string (cover_value):NULL,
- tracks);
+ window = brasero_session_edit_cover (dialog->priv->session);
gtk_dialog_run (GTK_DIALOG (window));
gtk_widget_destroy (window);
return FALSE;
@@ -1866,7 +1846,8 @@
|| (dialog->priv->input.type == BRASERO_TRACK_TYPE_DISC
&& (dialog->priv->input.subtype.media & BRASERO_MEDIUM_HAS_AUDIO))) {
/* since we succeed offer the possibility to create cover if that's an audio disc */
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Create Cover"), GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ _("_Create Cover"), GTK_RESPONSE_CLOSE);
}
res = brasero_burn_dialog_success_run (dialog);
@@ -2080,22 +2061,20 @@
(message),
_("Interrupting the process may make disc unusable."));
- button = brasero_utils_make_button (("C_ontinue Burning"),
- GTK_STOCK_OK,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message),
- button, GTK_RESPONSE_OK);
-
- button = brasero_utils_make_button (_("_Cancel Burning"),
- GTK_STOCK_CANCEL,
- NULL,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show_all (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (message),
- button, GTK_RESPONSE_CANCEL);
-
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("C_ontinue Burning"),
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_OK,
+ GTK_ICON_SIZE_BUTTON));
+
+ button = gtk_dialog_add_button (GTK_DIALOG (message),
+ _("_Cancel Burning"),
+ GTK_RESPONSE_CANCEL);
+ gtk_button_set_image (GTK_BUTTON (button),
+ gtk_image_new_from_stock (GTK_STOCK_CANCEL,
+ GTK_ICON_SIZE_BUTTON));
+
result = gtk_dialog_run (GTK_DIALOG (message));
gtk_widget_destroy (message);
Copied: trunk/libbrasero-burn/brasero-burn-dialog.h (from r2117, /trunk/src/brasero-burn-dialog.h)
==============================================================================
--- /trunk/src/brasero-burn-dialog.h (original)
+++ trunk/libbrasero-burn/brasero-burn-dialog.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-dialog.h
- *
- * mer jun 29 13:05:45 2005
- * Copyright 2005 Philippe Rouquier
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -32,8 +36,7 @@
#include <gtk/gtk.h>
-#include "burn-basics.h"
-#include "burn.h"
+#include "brasero-burn.h"
G_BEGIN_DECLS
#define BRASERO_TYPE_BURN_DIALOG (brasero_burn_dialog_get_type ())
Added: trunk/libbrasero-burn/brasero-burn-lib.h.in
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-burn-lib.h.in Thu Mar 19 20:22:59 2009
@@ -0,0 +1,84 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _BRASERO_BURN_LIB_
+#define _BRASERO_BURN_LIB_
+
+#include <glib.h>
+
+#include <brasero-errors.h>
+
+G_BEGIN_DECLS
+
+/**
+ * Some needed information about the library
+ */
+
+#define LIBBRASERO_BURN_VERSION_MAJOR \
+ @BRASERO_MAJOR_VERSION@
+#define LIBBRASERO_BURN_VERSION_MINOR \
+ @BRASERO_MINOR_VERSION@
+#define LIBBRASERO_BURN_VERSION_MICRO \
+ @BRASERO_SUB@
+#define LIBBRASERO_BURN_AGE \
+ @LT_CURRENT@@LT_REVISION@@LT_AGE@
+
+
+/**
+ * Function to start and stop the library
+ */
+
+gboolean
+brasero_burn_library_start (void);
+
+void
+brasero_burn_library_stop (void);
+
+/**
+ * GOptionGroup for apps
+ */
+
+GOptionGroup *
+brasero_burn_library_get_option_group (void);
+
+/**
+ * Allows to get some information about capabilities
+ */
+
+GSList *
+brasero_burn_library_get_plugins_list (void);
+
+gboolean
+brasero_burn_library_can_checksum (void);
+
+G_END_DECLS
+
+#endif /* _BRASERO_BURN_LIB_ */
+
Copied: trunk/libbrasero-burn/brasero-burn-options.c (from r2117, /trunk/src/brasero-burn-options.c)
==============================================================================
--- /trunk/src/brasero-burn-options.c (original)
+++ trunk/libbrasero-burn/brasero-burn-options.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -28,18 +39,20 @@
#include <gtk/gtk.h>
#include "burn-basics.h"
-#include "burn-session.h"
#include "burn-caps.h"
+
#include "brasero-medium.h"
#include "brasero-medium-selection-priv.h"
+#include "brasero-session.h"
#include "brasero-burn-options.h"
#include "brasero-session-cfg.h"
-#include "brasero-notify.h"
#include "brasero-dest-selection.h"
-#include "brasero-utils.h"
#include "brasero-medium-properties.h"
+#include "brasero-notify.h"
+#include "brasero-misc.h"
+
typedef struct _BraseroBurnOptionsPrivate BraseroBurnOptionsPrivate;
struct _BraseroBurnOptionsPrivate
{
@@ -62,8 +75,6 @@
#define BRASERO_BURN_OPTIONS_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_BURN_OPTIONS, BraseroBurnOptionsPrivate))
-
-
G_DEFINE_TYPE (BraseroBurnOptions, brasero_burn_options, GTK_TYPE_DIALOG);
void
@@ -137,14 +148,13 @@
priv->button = NULL;
}
- priv->button = brasero_utils_make_button (text,
- NULL,
- icon,
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (priv->button);
- gtk_dialog_add_action_widget (GTK_DIALOG (self),
- priv->button,
- GTK_RESPONSE_OK);
+ priv->button = gtk_dialog_add_button (GTK_DIALOG (self),
+ text,
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (priv->button),
+ gtk_image_new_from_icon_name (icon,
+ GTK_ICON_SIZE_BUTTON));
+
return priv->button;
}
@@ -389,14 +399,12 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
/* Create a default Burn button */
- priv->button = brasero_utils_make_button (_("_Burn"),
- NULL,
- "media-optical-burn",
- GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (priv->button);
- gtk_dialog_add_action_widget (GTK_DIALOG (object),
- priv->button,
- GTK_RESPONSE_OK);
+ priv->button = gtk_dialog_add_button (GTK_DIALOG (object),
+ _("_Burn"),
+ GTK_RESPONSE_OK);
+ gtk_button_set_image (GTK_BUTTON (priv->button),
+ gtk_image_new_from_icon_name ("media-optical-burn",
+ GTK_ICON_SIZE_BUTTON));
/* Create an upper box for sources */
priv->source = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
Copied: trunk/libbrasero-burn/brasero-burn-options.h (from r2117, /trunk/src/brasero-burn-options.h)
==============================================================================
--- /trunk/src/brasero-burn-options.h (original)
+++ trunk/libbrasero-burn/brasero-burn-options.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_BURN_OPTIONS_H_
Copied: trunk/libbrasero-burn/brasero-burn.c (from r2117, /trunk/src/burn.c)
==============================================================================
--- /trunk/src/burn.c (original)
+++ trunk/libbrasero-burn/brasero-burn.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn.c
- *
- * ven mar 3 18:50:18 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -44,10 +48,9 @@
#include "brasero-marshal.h"
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-track.h"
-#include "burn-session.h"
-#include "burn.h"
-#include "burn-session.h"
+#include "brasero-track.h"
+#include "brasero-session.h"
+#include "brasero-burn.h"
#include "burn-task-ctx.h"
#include "burn-task.h"
#include "burn-caps.h"
Added: trunk/libbrasero-burn/brasero-burn.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-burn.h Thu Mar 19 20:22:59 2009
@@ -0,0 +1,120 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef BURN_H
+#define BURN_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <brasero-error.h>
+#include <brasero-track.h>
+#include <brasero-session.h>
+
+#include <brasero-medium.h>
+
+G_BEGIN_DECLS
+
+#define BRASERO_TYPE_BURN (brasero_burn_get_type ())
+#define BRASERO_BURN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_BURN, BraseroBurn))
+#define BRASERO_BURN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_BURN, BraseroBurnClass))
+#define BRASERO_IS_BURN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_BURN))
+#define BRASERO_IS_BURN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_BURN))
+#define BRASERO_BURN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_BURN, BraseroBurnClass))
+
+typedef struct {
+ GObject parent;
+} BraseroBurn;
+
+typedef struct {
+ GObjectClass parent_class;
+
+ /* signals */
+ BraseroBurnResult (*insert_media_request) (BraseroBurn *obj,
+ BraseroDrive *drive,
+ BraseroBurnError error,
+ BraseroMedia required_media);
+
+ BraseroBurnResult (*location_request) (BraseroBurn *obj,
+ GError *error,
+ gboolean is_temporary);
+
+ BraseroBurnResult (*ask_disable_joliet) (BraseroBurn *obj);
+
+ BraseroBurnResult (*warn_data_loss) (BraseroBurn *obj);
+ BraseroBurnResult (*warn_previous_session_loss) (BraseroBurn *obj);
+ BraseroBurnResult (*warn_audio_to_appendable) (BraseroBurn *obj);
+ BraseroBurnResult (*warn_rewritable) (BraseroBurn *obj);
+
+ BraseroBurnResult (*dummy_success) (BraseroBurn *obj);
+
+ void (*progress_changed) (BraseroBurn *obj,
+ gdouble overall_progress,
+ gdouble action_progress,
+ glong time_remaining);
+ void (*action_changed) (BraseroBurn *obj,
+ BraseroBurnAction action);
+} BraseroBurnClass;
+
+GType brasero_burn_get_type ();
+BraseroBurn *brasero_burn_new ();
+
+BraseroBurnResult
+brasero_burn_record (BraseroBurn *burn,
+ BraseroBurnSession *session,
+ GError **error);
+
+BraseroBurnResult
+brasero_burn_check (BraseroBurn *burn,
+ BraseroBurnSession *session,
+ GError **error);
+
+BraseroBurnResult
+brasero_burn_blank (BraseroBurn *burn,
+ BraseroBurnSession *session,
+ GError **error);
+
+BraseroBurnResult
+brasero_burn_cancel (BraseroBurn *burn,
+ gboolean protect);
+
+BraseroBurnResult
+brasero_burn_status (BraseroBurn *burn,
+ BraseroMedia *info,
+ gint64 *isosize,
+ gint64 *written,
+ gint64 *rate);
+
+void
+brasero_burn_get_action_string (BraseroBurn *burn,
+ BraseroBurnAction action,
+ gchar **string);
+
+#endif /* BURN_H */
Copied: trunk/libbrasero-burn/brasero-burn.h.in (from r2117, /trunk/src/burn.h)
==============================================================================
--- /trunk/src/burn.h (original)
+++ trunk/libbrasero-burn/brasero-burn.h.in Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn.h
- *
- * ven mar 3 18:50:18 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -30,14 +34,35 @@
#include <glib.h>
#include <glib-object.h>
-#include "burn-basics.h"
-#include "burn-caps.h"
-#include "burn-session.h"
-#include "burn-task.h"
-#include "brasero-medium.h"
+#include <brasero-error.h>
+#include <brasero-track.h>
+#include <brasero-session.h>
+
+#include <brasero-medium.h>
G_BEGIN_DECLS
+typedef enum {
+ BRASERO_BURN_ACTION_NONE = 0,
+ BRASERO_BURN_ACTION_GETTING_SIZE,
+ BRASERO_BURN_ACTION_CREATING_IMAGE,
+ BRASERO_BURN_ACTION_RECORDING,
+ BRASERO_BURN_ACTION_BLANKING,
+ BRASERO_BURN_ACTION_CHECKSUM,
+ BRASERO_BURN_ACTION_DRIVE_COPY,
+ BRASERO_BURN_ACTION_FILE_COPY,
+ BRASERO_BURN_ACTION_ANALYSING,
+ BRASERO_BURN_ACTION_TRANSCODING,
+ BRASERO_BURN_ACTION_PREPARING,
+ BRASERO_BURN_ACTION_LEADIN,
+ BRASERO_BURN_ACTION_RECORDING_CD_TEXT,
+ BRASERO_BURN_ACTION_FIXATING,
+ BRASERO_BURN_ACTION_LEADOUT,
+ BRASERO_BURN_ACTION_START_RECORDING,
+ BRASERO_BURN_ACTION_FINISHED,
+ BRASERO_BURN_ACTION_LAST
+} BraseroBurnAction;
+
#define BRASERO_TYPE_BURN (brasero_burn_get_type ())
#define BRASERO_BURN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_BURN, BraseroBurn))
#define BRASERO_BURN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_BURN, BraseroBurnClass))
Added: trunk/libbrasero-burn/brasero-cover.c
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-cover.c Thu Mar 19 20:22:59 2009
@@ -0,0 +1,244 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
+
+#include <gtk/gtk.h>
+
+#include "brasero-jacket-edit.h"
+#include "brasero-jacket-view.h"
+
+#include "brasero-units.h"
+
+#include "brasero-tags.h"
+#include "brasero-track.h"
+#include "brasero-session.h"
+
+#include "brasero-cover.h"
+
+/**
+ *
+ */
+
+#define BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT(buffer_MACRO, text_MACRO, tag_MACRO, start_MACRO) \
+ gtk_text_buffer_insert_with_tags_by_name (buffer_MACRO, start_MACRO, text_MACRO, -1, tag_MACRO, NULL);
+
+static void
+brasero_jacket_edit_set_audio_tracks_back (BraseroJacketView *back,
+ const gchar *label,
+ GSList *tracks)
+{
+ GtkTextBuffer *buffer;
+ GtkTextIter start;
+ GSList *iter;
+
+ /* create the tags for back cover */
+ buffer = brasero_jacket_view_get_body_buffer (back);
+
+ gtk_text_buffer_create_tag (buffer,
+ "Title",
+ "justification", GTK_JUSTIFY_CENTER,
+ "weight", PANGO_WEIGHT_BOLD,
+ "size", 12 * PANGO_SCALE,
+ NULL);
+ gtk_text_buffer_create_tag (buffer,
+ "Subtitle",
+ "justification", GTK_JUSTIFY_LEFT,
+ "weight", PANGO_WEIGHT_NORMAL,
+ "size", 10 * PANGO_SCALE,
+ NULL);
+ gtk_text_buffer_create_tag (buffer,
+ "Artist",
+ "weight", PANGO_WEIGHT_NORMAL,
+ "justification", GTK_JUSTIFY_LEFT,
+ "size", 8 * PANGO_SCALE,
+ "style", PANGO_STYLE_ITALIC,
+ NULL);
+
+ gtk_text_buffer_get_start_iter (buffer, &start);
+
+ if (label) {
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Title", &start);
+ }
+
+ for (iter = tracks; iter; iter = iter->next) {
+ gchar *num;
+ gchar *time;
+ BraseroTrack *track;
+ BraseroSongInfo *info;
+
+ track = iter->data;
+ if (brasero_track_get_type (track, NULL) != BRASERO_TRACK_TYPE_AUDIO)
+ continue;
+
+ num = g_strdup_printf ("%i - ", g_slist_index (tracks, track) + 1);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, num, "Subtitle", &start);
+ g_free (num);
+
+ info = brasero_track_get_audio_info (track);
+
+ if (info) {
+ if (info->title) {
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->title, "Subtitle", &start);
+ }
+ else {
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("Unknown song"), "Subtitle", &start);
+ }
+
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\t\t", "Subtitle", &start);
+
+ time = brasero_units_get_time_string (brasero_track_get_audio_end (track) -
+ brasero_track_get_audio_start (track),
+ TRUE,
+ FALSE);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, time, "Subtitle", &start);
+ g_free (time);
+
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n", "Subtitle", &start);
+
+ if (info->artist) {
+ /* Reminder: if this string happens to be used
+ * somewhere else in brasero we'll need a
+ * context with C_() macro */
+ /* Translators: "by" is followed by the name of an artist.
+ * This text is the one written on the cover of a disc.
+ * Before it there is the name of the song.
+ * I had to break it because it is in a GtkTextBuffer
+ * and every word has a different tag. */
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("by"), "Artist", &start);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->artist, "Artist", &start);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
+ }
+
+ if (info->composer)
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->composer, "Subtitle", &start);
+
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Subtitle", &start);
+ }
+ }
+
+ /* side */
+ buffer = brasero_jacket_view_get_side_buffer (back);
+
+ /* create the tags for sides */
+ gtk_text_buffer_create_tag (buffer,
+ "Title",
+ "justification", GTK_JUSTIFY_CENTER,
+ "weight", PANGO_WEIGHT_BOLD,
+ "size", 10 * PANGO_SCALE,
+ NULL);
+
+ gtk_text_buffer_get_start_iter (buffer, &start);
+
+ if (label) {
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+ }
+
+}
+
+static void
+brasero_jacket_edit_set_audio_tracks_front (BraseroJacketView *front,
+ const gchar *cover,
+ const gchar *label)
+{
+ /* set background for front cover */
+ if (cover) {
+ gchar *path;
+
+ path = g_filename_from_uri (cover, NULL, NULL);
+ if (!path)
+ path = g_strdup (cover);
+
+ brasero_jacket_view_set_image_style (front, BRASERO_JACKET_IMAGE_STRETCH);
+ brasero_jacket_view_set_image (front, path);
+ g_free (path);
+ }
+
+ /* create the tags for front cover */
+ if (label) {
+ GtkTextBuffer *buffer;
+ GtkTextIter start;
+
+ buffer = brasero_jacket_view_get_body_buffer (front);
+ gtk_text_buffer_create_tag (buffer,
+ "Title",
+ "justification", GTK_JUSTIFY_CENTER,
+ "weight", PANGO_WEIGHT_BOLD,
+ "size", 14 * PANGO_SCALE,
+ NULL);
+
+ gtk_text_buffer_get_start_iter (buffer, &start);
+
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n\n\n", "Title", &start);
+ BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
+ }
+}
+
+GtkWidget *
+brasero_session_edit_cover (BraseroBurnSession *session,
+ GtkWidget *toplevel)
+{
+ BraseroJacketEdit *contents;
+ GValue *cover_value;
+ const gchar *title;
+ GtkWidget *edit;
+ GSList *tracks;
+
+ edit = brasero_jacket_edit_dialog_new (GTK_WIDGET (toplevel), &contents);
+
+ /* Don't go any further if it's not video */
+ if (brasero_burn_session_get_input_type (session, NULL) != BRASERO_TRACK_TYPE_AUDIO)
+ return edit;
+
+ title = brasero_burn_session_get_label (session);
+ tracks = brasero_burn_session_get_tracks (session);
+
+ cover_value = NULL;
+ brasero_burn_session_tag_lookup (session,
+ BRASERO_COVER_URI,
+ &cover_value);
+
+ brasero_jacket_edit_freeze (BRASERO_JACKET_EDIT (edit));
+ brasero_jacket_edit_set_audio_tracks_front (brasero_jacket_edit_get_front (BRASERO_JACKET_EDIT (edit)),
+ cover_value? g_value_get_string (cover_value):NULL,
+ title);
+ brasero_jacket_edit_set_audio_tracks_back (brasero_jacket_edit_get_back (BRASERO_JACKET_EDIT (edit)), title, tracks);
+ brasero_jacket_edit_thaw (BRASERO_JACKET_EDIT (edit));
+
+ return edit;
+}
Added: trunk/libbrasero-burn/brasero-cover.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-cover.h Thu Mar 19 20:22:59 2009
@@ -0,0 +1,45 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _BRASERO_COVER_
+#define _BRASERO_COVER_
+
+#include <gtk/gtk.h>
+
+
+G_BEGIN_DECLS
+
+GtkWidget *
+brasero_session_edit_cover (BraseroBurnSession *session,
+ GtkWidget *toplevel);
+
+G_END_DECLS
+
+#endif
Copied: trunk/libbrasero-burn/brasero-dest-selection.c (from r2117, /trunk/src/brasero-dest-selection.c)
==============================================================================
--- /trunk/src/brasero-dest-selection.c (original)
+++ trunk/libbrasero-burn/brasero-dest-selection.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * brasero is distributed in the hope that it will be useful,
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -36,9 +44,9 @@
#include "burn-basics.h"
#include "burn-caps.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "brasero-medium.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-plugin-manager.h"
#include "brasero-drive.h"
#include "brasero-volume.h"
Copied: trunk/libbrasero-burn/brasero-dest-selection.h (from r2117, /trunk/src/brasero-dest-selection.h)
==============================================================================
--- /trunk/src/brasero-dest-selection.h (original)
+++ trunk/libbrasero-burn/brasero-dest-selection.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -28,7 +36,7 @@
#include <gtk/gtk.h>
#include "brasero-medium-selection.h"
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/brasero-disc-copy-dialog.c (from r2117, /trunk/src/brasero-disc-copy-dialog.c)
==============================================================================
--- /trunk/src/brasero-disc-copy-dialog.c (original)
+++ trunk/libbrasero-burn/brasero-disc-copy-dialog.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * disc-copy-dialog.c
- *
- * ven jui 15 16:02:10 2005
- * Copyright 2005 Philippe Rouquier
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -40,7 +44,7 @@
#include <gtk/gtk.h>
#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-caps.h"
#include "brasero-medium.h"
#include "brasero-utils.h"
Copied: trunk/libbrasero-burn/brasero-disc-copy-dialog.h (from r2117, /trunk/src/brasero-disc-copy-dialog.h)
==============================================================================
--- /trunk/src/brasero-disc-copy-dialog.h (original)
+++ trunk/libbrasero-burn/brasero-disc-copy-dialog.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * disc-copy-dialog.h
- *
- * ven jui 15 16:02:10 2005
- * Copyright 2005 Philippe Rouquier
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-disc-option-dialog.c (from r2117, /trunk/src/brasero-disc-option-dialog.c)
==============================================================================
--- /trunk/src/brasero-disc-option-dialog.c (original)
+++ trunk/libbrasero-burn/brasero-disc-option-dialog.c Thu Mar 19 20:22:59 2009
@@ -1,29 +1,32 @@
-/***************************************************************************
- * brasero-disc-option-dialog.c
- *
- * jeu sep 28 17:28:45 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
-
#include <string.h>
#ifdef HAVE_CONFIG_H
@@ -36,23 +39,23 @@
#include <gtk/gtk.h>
-#include "burn-basics.h"
#include "brasero-drive.h"
#include "brasero-medium.h"
#include "brasero-volume.h"
-#include "burn-session.h"
+
+#include "brasero-misc.h"
+
+#include "burn-basics.h"
+#include "brasero-tags.h"
+#include "brasero-session.h"
#include "burn-caps.h"
#include "burn-plugin-manager.h"
#include "brasero-disc-option-dialog.h"
#include "brasero-dest-selection.h"
#include "brasero-session-cfg.h"
-#include "brasero-disc.h"
-#include "brasero-utils.h"
#include "brasero-burn-options.h"
-/* This is only used when called through other apps */
-#include "brasero-project-name.h"
-#include "brasero-app.h"
+#include "brasero-disc.h"
G_DEFINE_TYPE (BraseroDiscOptionDialog, brasero_disc_option_dialog, BRASERO_TYPE_BURN_OPTIONS);
@@ -60,8 +63,6 @@
BraseroBurnCaps *caps;
BraseroDisc *disc;
- GtkWidget *label;
-
GtkWidget *joliet_toggle;
GtkWidget *video_options;
@@ -399,32 +400,6 @@
widget = gtk_vbox_new (FALSE, 0);
brasero_burn_options_add_options (BRASERO_BURN_OPTIONS (dialog), widget);
- if (!brasero_app_is_running (brasero_app_get_default ())) {
- const gchar *label;
- BraseroBurnSession *session;
-
- /* Add the volume name widget but if and only if there isn't any
- * label already set in the BraseroBurnSession object. */
-
- priv->label = brasero_project_name_new ();
- brasero_project_name_set_type (BRASERO_PROJECT_NAME (priv->label),
- BRASERO_PROJECT_TYPE_DATA);
-
- session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
- label = brasero_burn_session_get_label (session);
- g_object_unref (session);
- if (label)
- gtk_entry_set_text (GTK_ENTRY (priv->label), label);
-
- string = g_strdup_printf ("<b>%s</b>", _("Disc name"));
- options = brasero_utils_pack_properties (string,
- priv->label,
- NULL);
- g_free (string);
-
- gtk_box_pack_start (GTK_BOX (widget), options, FALSE, FALSE, 0);
- }
-
/* general options */
brasero_disc_option_dialog_joliet_widget (dialog);
string = g_strdup_printf ("<b>%s</b>", _("Disc options"));
@@ -807,13 +782,6 @@
session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (self));
brasero_disc_set_session_contents (priv->disc, session);
- if (priv->label) {
- const gchar *label;
-
- label = gtk_entry_get_text (GTK_ENTRY (priv->label));
- brasero_burn_session_set_label (session, label);
- }
-
return session;
}
Copied: trunk/libbrasero-burn/brasero-disc-option-dialog.h (from r2117, /trunk/src/brasero-disc-option-dialog.h)
==============================================================================
--- /trunk/src/brasero-disc-option-dialog.h (original)
+++ trunk/libbrasero-burn/brasero-disc-option-dialog.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * brasero-disc-option-dialog.h
- *
- * jeu sep 28 17:28:45 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-drive-properties.c (from r2117, /trunk/src/brasero-drive-properties.c)
==============================================================================
--- /trunk/src/brasero-drive-properties.c (original)
+++ trunk/libbrasero-burn/brasero-drive-properties.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -34,11 +42,13 @@
#include <gtk/gtk.h>
-#include "burn-basics.h"
#include "brasero-medium.h"
-#include "burn-debug.h"
#include "brasero-drive.h"
-#include "brasero-utils.h"
+
+#include "brasero-misc.h"
+
+#include "burn-basics.h"
+#include "burn-debug.h"
#include "brasero-session-cfg.h"
#include "brasero-drive-properties.h"
Copied: trunk/libbrasero-burn/brasero-drive-properties.h (from r2117, /trunk/src/brasero-drive-properties.h)
==============================================================================
--- /trunk/src/brasero-drive-properties.h (original)
+++ trunk/libbrasero-burn/brasero-drive-properties.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Added: trunk/libbrasero-burn/brasero-enums.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-enums.h Thu Mar 19 20:22:59 2009
@@ -0,0 +1,110 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _BRASERO_ENUM_H_
+#define _BRASERO_ENUM_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef enum {
+ BRASERO_BURN_OK,
+ BRASERO_BURN_ERR,
+ BRASERO_BURN_RETRY,
+ BRASERO_BURN_CANCEL,
+ BRASERO_BURN_RUNNING,
+ BRASERO_BURN_DANGEROUS,
+ BRASERO_BURN_NOT_READY,
+ BRASERO_BURN_NOT_RUNNING,
+ BRASERO_BURN_NEED_RELOAD,
+ BRASERO_BURN_NOT_SUPPORTED,
+} BraseroBurnResult;
+
+/* These flags are sorted by importance. That's done to solve the problem of
+ * exclusive flags: that way MERGE will always win over any other flag if they
+ * are exclusive. On the other hand DAO will always lose. */
+typedef enum {
+ BRASERO_BURN_FLAG_NONE = 0,
+
+ /* These flags should always be supported */
+ BRASERO_BURN_FLAG_EJECT = 1,
+ BRASERO_BURN_FLAG_NOGRACE = 1 << 1,
+ BRASERO_BURN_FLAG_DONT_OVERWRITE = 1 << 2,
+ BRASERO_BURN_FLAG_CHECK_SIZE = 1 << 3,
+
+ /* These are of great importance for the result */
+ BRASERO_BURN_FLAG_MERGE = 1 << 4,
+ BRASERO_BURN_FLAG_MULTI = 1 << 5,
+ BRASERO_BURN_FLAG_APPEND = 1 << 6,
+
+ BRASERO_BURN_FLAG_BURNPROOF = 1 << 7,
+ BRASERO_BURN_FLAG_NO_TMP_FILES = 1 << 8,
+ BRASERO_BURN_FLAG_DUMMY = 1 << 9,
+
+ /* FIXME! this flag is more or less linked to OVERBURN one can't we do
+ * a single one */
+ BRASERO_BURN_FLAG_OVERBURN = 1 << 10,
+
+ BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE = 1 << 11,
+ BRASERO_BURN_FLAG_FAST_BLANK = 1 << 12,
+
+ /* NOTE: these two are contradictory? */
+ BRASERO_BURN_FLAG_DAO = 1 << 13,
+ BRASERO_BURN_FLAG_RAW = 1 << 14,
+
+ BRASERO_BURN_FLAG_LAST
+} BraseroBurnFlag;
+
+typedef enum {
+ BRASERO_BURN_ACTION_NONE = 0,
+ BRASERO_BURN_ACTION_GETTING_SIZE,
+ BRASERO_BURN_ACTION_CREATING_IMAGE,
+ BRASERO_BURN_ACTION_RECORDING,
+ BRASERO_BURN_ACTION_BLANKING,
+ BRASERO_BURN_ACTION_CHECKSUM,
+ BRASERO_BURN_ACTION_DRIVE_COPY,
+ BRASERO_BURN_ACTION_FILE_COPY,
+ BRASERO_BURN_ACTION_ANALYSING,
+ BRASERO_BURN_ACTION_TRANSCODING,
+ BRASERO_BURN_ACTION_PREPARING,
+ BRASERO_BURN_ACTION_LEADIN,
+ BRASERO_BURN_ACTION_RECORDING_CD_TEXT,
+ BRASERO_BURN_ACTION_FIXATING,
+ BRASERO_BURN_ACTION_LEADOUT,
+ BRASERO_BURN_ACTION_START_RECORDING,
+ BRASERO_BURN_ACTION_FINISHED,
+ BRASERO_BURN_ACTION_LAST
+} BraseroBurnAction;
+
+G_END_DECLS
+
+#endif
+
Added: trunk/libbrasero-burn/brasero-error.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-error.h Thu Mar 19 20:22:59 2009
@@ -0,0 +1,91 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _BRASERO_ERROR_H_
+#define _BRASERO_ERROR_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef enum {
+ BRASERO_BURN_ERROR_NONE,
+ BRASERO_BURN_ERROR_GENERAL,
+
+ BRASERO_BURN_ERROR_PLUGIN_MISBEHAVIOR,
+
+ BRASERO_BURN_ERROR_SLOW_DMA,
+ BRASERO_BURN_ERROR_PERMISSION,
+ BRASERO_BURN_ERROR_DRIVE_BUSY,
+ BRASERO_BURN_ERROR_DISK_SPACE,
+
+ BRASERO_BURN_ERROR_INPUT_INVALID,
+
+ BRASERO_BURN_ERROR_OUTPUT_NONE,
+
+ BRASERO_BURN_ERROR_FILE_INVALID,
+ BRASERO_BURN_ERROR_FILE_NOT_FOUND,
+ BRASERO_BURN_ERROR_FILE_NOT_LOCAL,
+
+ BRASERO_BURN_ERROR_WRITE_MEDIUM,
+ BRASERO_BURN_ERROR_WRITE_IMAGE,
+
+ BRASERO_BURN_ERROR_IMAGE_INVALID,
+ BRASERO_BURN_ERROR_IMAGE_JOLIET,
+ BRASERO_BURN_ERROR_IMAGE_LAST_SESSION,
+
+ BRASERO_BURN_ERROR_MEDIUM_NONE,
+ BRASERO_BURN_ERROR_MEDIUM_INVALID,
+ BRASERO_BURN_ERROR_MEDIUM_SPACE,
+ BRASERO_BURN_ERROR_MEDIUM_NO_DATA,
+ BRASERO_BURN_ERROR_MEDIUM_NOT_WRITABLE,
+ BRASERO_BURN_ERROR_MEDIUM_NOT_REWRITABLE,
+ BRASERO_BURN_ERROR_MEDIUM_NEED_RELOADING,
+
+ BRASERO_BURN_ERROR_BAD_CHECKSUM,
+
+ /* these are not necessarily error */
+ BRASERO_BURN_WARNING_CHECKSUM,
+ BRASERO_BURN_WARNING_INSERT_AFTER_COPY
+} BraseroBurnError;
+
+/**
+ * Error handling and defined return values
+ */
+
+GQuark brasero_burn_quark (void);
+
+#define BRASERO_BURN_ERROR \
+ brasero_burn_quark()
+
+G_END_DECLS
+
+#endif /* _BRASERO_ERROR_H_ */
+
Copied: trunk/libbrasero-burn/brasero-image-option-dialog.c (from r2117, /trunk/src/brasero-image-option-dialog.c)
==============================================================================
--- /trunk/src/brasero-image-option-dialog.c (original)
+++ trunk/libbrasero-burn/brasero-image-option-dialog.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * brasero-image-option-dialog.c
- *
- * jeu sep 28 17:28:10 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-image-option-dialog.h (from r2117, /trunk/src/brasero-image-option-dialog.h)
==============================================================================
--- /trunk/src/brasero-image-option-dialog.h (original)
+++ trunk/libbrasero-burn/brasero-image-option-dialog.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * brasero-image-option-dialog.h
- *
- * jeu sep 28 17:28:10 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -32,7 +36,7 @@
#include <gtk/gtk.h>
-#include "burn-session.h"
+#include "brasero-session.h"
#include "brasero-burn-options.h"
Copied: trunk/libbrasero-burn/brasero-image-properties.c (from r2117, /trunk/src/brasero-image-properties.c)
==============================================================================
--- /trunk/src/brasero-image-properties.c (original)
+++ trunk/libbrasero-burn/brasero-image-properties.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-image-properties.h (from r2117, /trunk/src/brasero-image-properties.h)
==============================================================================
--- /trunk/src/brasero-image-properties.h (original)
+++ trunk/libbrasero-burn/brasero-image-properties.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -27,7 +35,7 @@
#include <gtk/gtk.h>
-#include "burn-track.h"
+#include "brasero-track.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/brasero-image-type-chooser.c (from r2117, /trunk/src/brasero-image-type-chooser.c)
==============================================================================
--- /trunk/src/brasero-image-type-chooser.c (original)
+++ trunk/libbrasero-burn/brasero-image-type-chooser.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * brasero-image-type-chooser.c
- *
- * mar oct 3 18:40:02 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-image-type-chooser.h (from r2117, /trunk/src/brasero-image-type-chooser.h)
==============================================================================
--- /trunk/src/brasero-image-type-chooser.h (original)
+++ trunk/libbrasero-burn/brasero-image-type-chooser.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * brasero-image-type-chooser.h
- *
- * mar oct 3 18:40:02 2006
- * Copyright 2006 Philippe Rouquier
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-medium-properties.c (from r2117, /trunk/src/brasero-medium-properties.c)
==============================================================================
--- /trunk/src/brasero-medium-properties.c (original)
+++ trunk/libbrasero-burn/brasero-medium-properties.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -36,9 +47,10 @@
#include "burn-basics.h"
#include "burn-caps.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "brasero-medium.h"
-#include "burn-session.h"
+#include "brasero-session.h"
+#include "burn-image-format.h"
typedef struct _BraseroMediumPropertiesPrivate BraseroMediumPropertiesPrivate;
struct _BraseroMediumPropertiesPrivate
Copied: trunk/libbrasero-burn/brasero-medium-properties.h (from r2117, /trunk/src/brasero-medium-properties.h)
==============================================================================
--- /trunk/src/brasero-medium-properties.h (original)
+++ trunk/libbrasero-burn/brasero-medium-properties.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_MEDIUM_PROPERTIES_H_
@@ -24,7 +35,7 @@
#include <gtk/gtk.h>
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/brasero-progress.c (from r2117, /trunk/src/brasero-progress.c)
==============================================================================
--- /trunk/src/brasero-progress.c (original)
+++ trunk/libbrasero-burn/brasero-progress.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * progress.c
- *
- * ven mar 10 15:42:01 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-progress.h (from r2117, /trunk/src/brasero-progress.h)
==============================================================================
--- /trunk/src/brasero-progress.h (original)
+++ trunk/libbrasero-burn/brasero-progress.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * progress.h
- *
- * ven mar 10 15:42:01 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-session-cfg.c (from r2117, /trunk/src/brasero-session-cfg.c)
==============================================================================
--- /trunk/src/brasero-session-cfg.c (original)
+++ trunk/libbrasero-burn/brasero-session-cfg.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +43,7 @@
#include "burn-basics.h"
#include "burn-debug.h"
#include "burn-plugin-manager.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-caps.h"
#include "burn-plugin-manager.h"
#include "burn-image-format.h"
Copied: trunk/libbrasero-burn/brasero-session-cfg.h (from r2117, /trunk/src/brasero-session-cfg.h)
==============================================================================
--- /trunk/src/brasero-session-cfg.h (original)
+++ trunk/libbrasero-burn/brasero-session-cfg.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_SESSION_CFG_H_
@@ -22,8 +33,7 @@
#include <glib-object.h>
-#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/brasero-session.c (from r2117, /trunk/src/burn-session.c)
==============================================================================
--- /trunk/src/burn-session.c (original)
+++ trunk/libbrasero-burn/brasero-session.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-session.c
- *
- * mer aoà 9 22:22:16 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -39,10 +43,13 @@
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
-#include "burn-session.h"
+#include "brasero-session.h"
+#include "brasero-track.h"
+
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-track.h"
+#include "burn-image-format.h"
+
#include "brasero-medium.h"
#include "brasero-drive.h"
#include "brasero-medium-monitor.h"
@@ -1666,3 +1673,4 @@
return obj;
}
+
Copied: trunk/libbrasero-burn/brasero-session.h (from r2117, /trunk/src/burn-session.h)
==============================================================================
--- /trunk/src/burn-session.h (original)
+++ trunk/libbrasero-burn/brasero-session.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-session.h
- *
- * mer aoà 9 22:22:16 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -30,13 +34,14 @@
#include <glib.h>
#include <glib-object.h>
-#include "burn-basics.h"
-#include "burn-track.h"
-#include "brasero-drive.h"
+#include <brasero-drive.h>
-G_BEGIN_DECLS
+#include <brasero-error.h>
+#include <brasero-track.h>
+G_BEGIN_DECLS
+
#define BRASERO_TYPE_BURN_SESSION (brasero_burn_session_get_type ())
#define BRASERO_BURN_SESSION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_BURN_SESSION, BraseroBurnSession))
#define BRASERO_BURN_SESSION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_BURN_SESSION, BraseroBurnSessionClass))
@@ -264,6 +269,7 @@
const gchar *format,
...);
+
/**
* These should be converted to tags
*/
Copied: trunk/libbrasero-burn/brasero-src-image.c (from r2117, /trunk/src/brasero-src-image.c)
==============================================================================
--- /trunk/src/brasero-src-image.c (original)
+++ trunk/libbrasero-burn/brasero-src-image.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -33,13 +44,17 @@
#include "burn-basics.h"
#include "burn-caps.h"
+
#include "brasero-drive.h"
-#include "brasero-utils.h"
+#include "brasero-misc.h"
+
#include "brasero-image-type-chooser.h"
-#include "brasero-io.h"
#include "brasero-session-cfg.h"
#include "brasero-src-image.h"
+#include "burn-image-format.h"
+
+#include "brasero-io.h"
typedef struct _BraseroSrcImagePrivate BraseroSrcImagePrivate;
struct _BraseroSrcImagePrivate
Copied: trunk/libbrasero-burn/brasero-src-image.h (from r2117, /trunk/src/brasero-src-image.h)
==============================================================================
--- /trunk/src/brasero-src-image.h (original)
+++ trunk/libbrasero-burn/brasero-src-image.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_SRC_IMAGE_H_
Copied: trunk/libbrasero-burn/brasero-src-selection.c (from r2117, /trunk/src/brasero-src-selection.c)
==============================================================================
--- /trunk/src/brasero-src-selection.c (original)
+++ trunk/libbrasero-burn/brasero-src-selection.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -32,8 +40,8 @@
#include "brasero-medium-selection.h"
#include "brasero-utils.h"
-#include "burn-track.h"
-#include "burn-session.h"
+#include "brasero-track.h"
+#include "brasero-session.h"
#include "brasero-drive.h"
#include "brasero-volume.h"
Copied: trunk/libbrasero-burn/brasero-src-selection.h (from r2117, /trunk/src/brasero-src-selection.h)
==============================================================================
--- /trunk/src/brasero-src-selection.h (original)
+++ trunk/libbrasero-burn/brasero-src-selection.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -26,7 +34,7 @@
#include <glib-object.h>
#include "brasero-medium-selection.h"
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Added: trunk/libbrasero-burn/brasero-tags.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-burn/brasero-tags.h Thu Mar 19 20:22:59 2009
@@ -0,0 +1,100 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _BRASERO_TAGS_H_
+#define _BRASERO_TAGS_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/**
+ * Some defined and usable tags for a track
+ */
+
+#define BRASERO_TRACK_MEDIUM_ADDRESS_START_TAG "track::medium::address::start"
+#define BRASERO_TRACK_MEDIUM_ADDRESS_END_TAG "track::medium::address::end"
+
+/**
+ * Array of filenames (on medium) which have a wrong checksum value (G_TYPE_STRV)
+ */
+
+#define BRASERO_TRACK_MEDIUM_WRONG_CHECKSUM_TAG "track::medium::error::checksum::list"
+
+/**
+ * Some defined and usable tags for a session
+ */
+
+/**
+ * Gives the uri (gchar *) of the cover
+ */
+#define BRASERO_COVER_URI "session::art::cover"
+
+/**
+ * Define the audio streams for a DVD
+ */
+#define BRASERO_DVD_AUDIO_STREAMS "session::DVD::audio::format"
+
+/**
+ * Define the format: whether VCD or SVCD
+ */
+enum {
+ BRASERO_VCD_NONE,
+ BRASERO_VCD_V1,
+ BRASERO_VCD_V2,
+ BRASERO_SVCD
+};
+#define BRASERO_VCD_TYPE "session::VCD::format"
+
+/**
+ * This is the video format that should be used.
+ */
+enum {
+ BRASERO_VIDEO_FRAMERATE_NATIVE,
+ BRASERO_VIDEO_FRAMERATE_NTSC,
+ BRASERO_VIDEO_FRAMERATE_PAL_SECAM
+};
+#define BRASERO_VIDEO_OUTPUT_FRAMERATE "session::video::framerate"
+
+/**
+ * Aspect ratio
+ */
+enum {
+ BRASERO_VIDEO_ASPECT_NATIVE,
+ BRASERO_VIDEO_ASPECT_4_3,
+ BRASERO_VIDEO_ASPECT_16_9
+};
+#define BRASERO_VIDEO_OUTPUT_ASPECT "session::video::aspect"
+
+
+
+G_END_DECLS
+
+#endif
Copied: trunk/libbrasero-burn/brasero-track.c (from r2117, /trunk/src/burn-track.c)
==============================================================================
--- /trunk/src/burn-track.c (original)
+++ trunk/libbrasero-burn/brasero-track.c Thu Mar 19 20:22:59 2009
@@ -1,26 +1,31 @@
-/***************************************************************************
- * burn-track.c
- *
- * Thu Dec 7 09:50:38 2006
- * Copyright 2006 Rouquier Philippe
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -36,7 +41,7 @@
#include <gio/gio.h>
-#include "burn-track.h"
+#include "brasero-track.h"
#include "burn-debug.h"
#include "brasero-medium.h"
#include "burn-image-format.h"
Copied: trunk/libbrasero-burn/brasero-track.h (from r2117, /trunk/src/burn-track.h)
==============================================================================
--- /trunk/src/burn-track.h (original)
+++ trunk/libbrasero-burn/brasero-track.h Thu Mar 19 20:22:59 2009
@@ -1,37 +1,43 @@
-/***************************************************************************
- * burn-track.h
- *
- * Thu Dec 7 09:51:03 2006
- * Copyright 2006 Rouquier Philippe
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
+#ifndef _BURN_TRACK_H
+#define _BURN_TRACK_H
+
#include <glib.h>
-#include "burn-basics.h"
-#include "brasero-drive.h"
-#include "brasero-medium.h"
-#include "burn-image-format.h"
+#include <brasero-drive.h>
+#include <brasero-medium.h>
-#ifndef _BURN_TRACK_H
-#define _BURN_TRACK_H
+#include <brasero-enums.h>
+#include <brasero-error.h>
G_BEGIN_DECLS
@@ -101,6 +107,18 @@
((end) - (start)) : BRASERO_MIN_AUDIO_TRACK_LENGTH
+typedef enum {
+ BRASERO_IMAGE_FORMAT_NONE = 0,
+ BRASERO_IMAGE_FORMAT_BIN = 1,
+ BRASERO_IMAGE_FORMAT_CUE = 1 << 1,
+ BRASERO_IMAGE_FORMAT_CLONE = 1 << 2,
+ BRASERO_IMAGE_FORMAT_CDRDAO = 1 << 3,
+ BRASERO_IMAGE_FORMAT_ANY = BRASERO_IMAGE_FORMAT_BIN|
+ BRASERO_IMAGE_FORMAT_CUE|
+ BRASERO_IMAGE_FORMAT_CDRDAO|
+ BRASERO_IMAGE_FORMAT_CLONE,
+} BraseroImageFormat;
+
/**
*
*/
Copied: trunk/libbrasero-burn/brasero-tray.c (from r2117, /trunk/src/brasero-tray.c)
==============================================================================
--- /trunk/src/brasero-tray.c (original)
+++ trunk/libbrasero-burn/brasero-tray.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * tray.c
- *
- * ven avr 14 16:56:49 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/brasero-tray.h (from r2117, /trunk/src/brasero-tray.h)
==============================================================================
--- /trunk/src/brasero-tray.h (original)
+++ trunk/libbrasero-burn/brasero-tray.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * tray.h
- *
- * ven avr 14 16:56:49 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-basics.c (from r2117, /trunk/src/burn-basics.c)
==============================================================================
--- /trunk/src/burn-basics.c (original)
+++ trunk/libbrasero-burn/burn-basics.c Thu Mar 19 20:22:59 2009
@@ -1,10 +1,22 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
@@ -15,15 +27,6 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
-
-/***************************************************************************
- * burn-basics.c
- *
- * Sat Feb 11 16:55:54 2006
- * Copyright 2006 philippe
- * <philippe Rouquier Philippe.localdomain>
- ****************************************************************************/
-
#include <string.h>
#ifdef HAVE_CONFIG_H
@@ -38,9 +41,10 @@
#include "burn-debug.h"
#include "burn-caps.h"
#include "burn-plugin-manager.h"
-#include "brasero-medium-monitor.h"
#include "burn-plugin-private.h"
+
#include "brasero-drive.h"
+#include "brasero-medium-monitor.h"
static BraseroPluginManager *plugin_manager = NULL;
static BraseroMediumMonitor *medium_manager = NULL;
@@ -85,8 +89,8 @@
return _(strings [action]);
}
-BraseroBurnResult
-brasero_burn_library_init (void)
+gboolean
+brasero_burn_library_start (void)
{
BRASERO_BURN_LOG ("Initializing Brasero-%i.%i.%i",
BRASERO_MAJOR_VERSION,
@@ -104,7 +108,7 @@
plugin_manager = brasero_plugin_manager_get_default ();
brasero_caps_list_dump ();
- return BRASERO_BURN_OK;
+ return TRUE;
}
GSList *
@@ -115,7 +119,7 @@
}
void
-brasero_burn_library_shutdown (void)
+brasero_burn_library_stop (void)
{
if (plugin_manager) {
g_object_unref (plugin_manager);
Copied: trunk/libbrasero-burn/burn-basics.h (from r2117, /trunk/src/burn-basics.h)
==============================================================================
--- /trunk/src/burn-basics.h (original)
+++ trunk/libbrasero-burn/burn-basics.h Thu Mar 19 20:22:59 2009
@@ -1,10 +1,22 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
@@ -15,23 +27,16 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
-
-/***************************************************************************
- * burn-basics.h
- *
- * Sat Feb 11 16:49:00 2006
- * Copyright 2006 philippe Rouquier
- * <brasero-app wanadoo fr>
- ****************************************************************************/
#ifndef _BURN_BASICS_H
#define _BURN_BASICS_H
#include <glib.h>
-G_BEGIN_DECLS
-
#include "brasero-units.h"
+#include "brasero-enums.h"
+
+G_BEGIN_DECLS
#define BRASERO_GET_BASENAME_FOR_DISPLAY(uri, name) \
{ \
@@ -41,10 +46,8 @@
g_free (escaped_basename); \
}
-GQuark brasero_burn_quark (void);
-#define BRASERO_BURN_ERROR brasero_burn_quark()
-
#define BRASERO_PLUGIN_DIRECTORY BRASERO_LIBDIR "/brasero/plugins"
+#define BRASERO_PLUGIN_KEY "/apps/brasero/config/plugins"
#define BRASERO_BURN_TMP_FILE_NAME "brasero_tmp_XXXXXX"
@@ -52,181 +55,11 @@
#define BRASERO_SHA1_FILE ".checksum.sha1"
#define BRASERO_SHA256_FILE ".checksum.sha256"
-typedef enum {
- BRASERO_BURN_ERROR_NONE,
- BRASERO_BURN_ERROR_GENERAL,
-
- BRASERO_BURN_ERROR_PLUGIN_MISBEHAVIOR,
-
- BRASERO_BURN_ERROR_SLOW_DMA,
- BRASERO_BURN_ERROR_PERMISSION,
- BRASERO_BURN_ERROR_DRIVE_BUSY,
- BRASERO_BURN_ERROR_DISK_SPACE,
-
- BRASERO_BURN_ERROR_INPUT_INVALID,
-
- BRASERO_BURN_ERROR_OUTPUT_NONE,
-
- BRASERO_BURN_ERROR_FILE_INVALID,
- BRASERO_BURN_ERROR_FILE_NOT_FOUND,
- BRASERO_BURN_ERROR_FILE_NOT_LOCAL,
-
- BRASERO_BURN_ERROR_WRITE_MEDIUM,
- BRASERO_BURN_ERROR_WRITE_IMAGE,
-
- BRASERO_BURN_ERROR_IMAGE_INVALID,
- BRASERO_BURN_ERROR_IMAGE_JOLIET,
- BRASERO_BURN_ERROR_IMAGE_LAST_SESSION,
-
- BRASERO_BURN_ERROR_MEDIUM_NONE,
- BRASERO_BURN_ERROR_MEDIUM_INVALID,
- BRASERO_BURN_ERROR_MEDIUM_SPACE,
- BRASERO_BURN_ERROR_MEDIUM_NO_DATA,
- BRASERO_BURN_ERROR_MEDIUM_NOT_WRITABLE,
- BRASERO_BURN_ERROR_MEDIUM_NOT_REWRITABLE,
- BRASERO_BURN_ERROR_MEDIUM_NEED_RELOADING,
-
- BRASERO_BURN_ERROR_BAD_CHECKSUM,
-
- /* these are not necessarily error */
- BRASERO_BURN_WARNING_CHECKSUM,
- BRASERO_BURN_WARNING_INSERT_AFTER_COPY
-} BraseroBurnError;
-
-typedef enum {
- BRASERO_BURN_OK,
- BRASERO_BURN_ERR,
- BRASERO_BURN_RETRY,
- BRASERO_BURN_CANCEL,
- BRASERO_BURN_RUNNING,
- BRASERO_BURN_DANGEROUS,
- BRASERO_BURN_NOT_READY,
- BRASERO_BURN_NOT_RUNNING,
- BRASERO_BURN_NEED_RELOAD,
- BRASERO_BURN_NOT_SUPPORTED,
-} BraseroBurnResult;
-
-typedef enum {
- BRASERO_BURN_ACTION_NONE = 0,
- BRASERO_BURN_ACTION_GETTING_SIZE,
- BRASERO_BURN_ACTION_CREATING_IMAGE,
- BRASERO_BURN_ACTION_RECORDING,
- BRASERO_BURN_ACTION_BLANKING,
- BRASERO_BURN_ACTION_CHECKSUM,
- BRASERO_BURN_ACTION_DRIVE_COPY,
- BRASERO_BURN_ACTION_FILE_COPY,
- BRASERO_BURN_ACTION_ANALYSING,
- BRASERO_BURN_ACTION_TRANSCODING,
- BRASERO_BURN_ACTION_PREPARING,
- BRASERO_BURN_ACTION_LEADIN,
- BRASERO_BURN_ACTION_RECORDING_CD_TEXT,
- BRASERO_BURN_ACTION_FIXATING,
- BRASERO_BURN_ACTION_LEADOUT,
- BRASERO_BURN_ACTION_START_RECORDING,
- BRASERO_BURN_ACTION_FINISHED,
- BRASERO_BURN_ACTION_LAST
-} BraseroBurnAction;
+#define BRASERO_BURN_FLAG_ALL 0xFFFF
const gchar *
brasero_burn_action_to_string (BraseroBurnAction action);
-/* These flags are sorted by importance. That's done to solve the problem of
- * exclusive flags: that way MERGE will always win over any other flag if they
- * are exclusive. On the other hand DAO will always lose. */
-typedef enum {
- BRASERO_BURN_FLAG_NONE = 0,
-
- /* These flags should always be supported */
- BRASERO_BURN_FLAG_EJECT = 1,
- BRASERO_BURN_FLAG_NOGRACE = 1 << 1,
- BRASERO_BURN_FLAG_DONT_OVERWRITE = 1 << 2,
- BRASERO_BURN_FLAG_CHECK_SIZE = 1 << 3,
-
- /* These are of great importance for the result */
- BRASERO_BURN_FLAG_MERGE = 1 << 4,
- BRASERO_BURN_FLAG_MULTI = 1 << 5,
- BRASERO_BURN_FLAG_APPEND = 1 << 6,
-
- BRASERO_BURN_FLAG_BURNPROOF = 1 << 7,
- BRASERO_BURN_FLAG_NO_TMP_FILES = 1 << 8,
- BRASERO_BURN_FLAG_DUMMY = 1 << 9,
-
- /* FIXME! this flag is more or less linked to OVERBURN one can't we do
- * a single one */
- BRASERO_BURN_FLAG_OVERBURN = 1 << 10,
-
- BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE = 1 << 11,
- BRASERO_BURN_FLAG_FAST_BLANK = 1 << 12,
-
- /* NOTE: these two are contradictory? */
- BRASERO_BURN_FLAG_DAO = 1 << 13,
- BRASERO_BURN_FLAG_RAW = 1 << 14,
-
- BRASERO_BURN_FLAG_LAST
-} BraseroBurnFlag;
-
-#define BRASERO_BURN_FLAG_ALL 0xFFFF
-
-#define BRASERO_PLUGIN_KEY "/apps/brasero/config/plugins"
-
-BraseroBurnResult
-brasero_burn_library_init (void);
-
-GSList *
-brasero_burn_library_get_plugins_list (void);
-
-gboolean
-brasero_burn_library_can_checksum (void);
-
-void
-brasero_burn_library_shutdown (void);
-
-/**
- * Some defined and usable tags for a session
- */
-
-/**
- * Gives the uri (gchar *) of the cover
- */
-#define BRASERO_COVER_URI "session::art::cover"
-
-/**
- * Define the audio streams for a DVD
- */
-#define BRASERO_DVD_AUDIO_STREAMS "session::DVD::audio::format"
-
-/**
- * Define the format: whether VCD or SVCD
- */
-enum {
- BRASERO_VCD_NONE,
- BRASERO_VCD_V1,
- BRASERO_VCD_V2,
- BRASERO_SVCD
-};
-#define BRASERO_VCD_TYPE "session::VCD::format"
-
-/**
- * This is the video format that should be used.
- */
-enum {
- BRASERO_VIDEO_FRAMERATE_NATIVE,
- BRASERO_VIDEO_FRAMERATE_NTSC,
- BRASERO_VIDEO_FRAMERATE_PAL_SECAM
-};
-#define BRASERO_VIDEO_OUTPUT_FRAMERATE "session::video::framerate"
-
-/**
- * Aspect ratio
- */
-enum {
- BRASERO_VIDEO_ASPECT_NATIVE,
- BRASERO_VIDEO_ASPECT_4_3,
- BRASERO_VIDEO_ASPECT_16_9
-};
-#define BRASERO_VIDEO_OUTPUT_ASPECT "session::video::aspect"
-
-
G_END_DECLS
#endif /* _BURN_BASICS_H */
Copied: trunk/libbrasero-burn/burn-caps.c (from r2117, /trunk/src/burn-caps.c)
==============================================================================
--- /trunk/src/burn-caps.c (original)
+++ trunk/libbrasero-burn/burn-caps.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-caps.c
- *
- * mar avr 18 20:58:42 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -42,7 +46,7 @@
#include "burn-debug.h"
#include "brasero-drive.h"
#include "brasero-medium.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-plugin.h"
#include "burn-plugin-private.h"
#include "burn-task.h"
Copied: trunk/libbrasero-burn/burn-caps.h (from r2117, /trunk/src/burn-caps.h)
==============================================================================
--- /trunk/src/burn-caps.h (original)
+++ trunk/libbrasero-burn/burn-caps.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-caps.h
- *
- * mar avr 18 20:58:42 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -32,7 +36,7 @@
#include "burn-basics.h"
#include "brasero-medium.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-plugin.h"
#include "burn-task.h"
#include "burn-caps.h"
Copied: trunk/libbrasero-burn/burn-dbus.c (from r2117, /trunk/src/burn-dbus.c)
==============================================================================
--- /trunk/src/burn-dbus.c (original)
+++ trunk/libbrasero-burn/burn-dbus.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,34 @@
-/* Copyright 2008 Luis Medinas <lmedinas gmail com>
- * Copyright 2008 Philippe Rouquier <brasero-app wanadoo fr>
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Luis Medinas 2008 <lmedinas gmail com>
+ * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Copied: trunk/libbrasero-burn/burn-dbus.h (from r2117, /trunk/src/burn-dbus.h)
==============================================================================
--- /trunk/src/burn-dbus.h (original)
+++ trunk/libbrasero-burn/burn-dbus.h Thu Mar 19 20:22:59 2009
@@ -1,18 +1,29 @@
-/* Copyright 2008 Luis Medinas <lmedinas gmail com>
- * Copyright 2008 Philippe Rouquier <brasero-app wanadoo fr>
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Luis Medinas 2008 <lmedinas gmail com>
+ * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-debug.c (from r2117, /trunk/src/burn-debug.c)
==============================================================================
--- /trunk/src/burn-debug.c (original)
+++ trunk/libbrasero-burn/burn-debug.c Thu Mar 19 20:22:59 2009
@@ -1,26 +1,31 @@
-/***************************************************************************
- * burn-debug.c
- *
- * Sat Apr 14 10:53:08 2007
- * Copyright 2007 Rouquier Philippe
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -35,7 +40,7 @@
#include "brasero-media-private.h"
#include "burn-debug.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "brasero-media.h"
static gboolean debug = FALSE;
Copied: trunk/libbrasero-burn/burn-debug.h (from r2117, /trunk/src/burn-debug.h)
==============================================================================
--- /trunk/src/burn-debug.h (original)
+++ trunk/libbrasero-burn/burn-debug.h Thu Mar 19 20:22:59 2009
@@ -1,26 +1,31 @@
-/***************************************************************************
- * burn-debug.h
- *
- * Sat Apr 14 11:59:32 2007
- * Copyright 2007 Rouquier Philippe
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BURN_DEBUG_H
@@ -30,7 +35,7 @@
#include <gmodule.h>
#include "brasero-medium.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "burn-plugin.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/burn-image-format.c (from r2117, /trunk/src/burn-image-format.c)
==============================================================================
--- /trunk/src/burn-image-format.c (original)
+++ trunk/libbrasero-burn/burn-image-format.c Thu Mar 19 20:22:59 2009
@@ -1,26 +1,31 @@
-/***************************************************************************
- * burn-images-format.c
- *
- * Mon Nov 5 16:01:44 2007
- * Copyright 2007 Philippe Rouquier
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Copied: trunk/libbrasero-burn/burn-image-format.h (from r2117, /trunk/src/burn-image-format.h)
==============================================================================
--- /trunk/src/burn-image-format.h (original)
+++ trunk/libbrasero-burn/burn-image-format.h Thu Mar 19 20:22:59 2009
@@ -1,26 +1,31 @@
-/***************************************************************************
- * burn-images-format.h
- *
- * Mon Nov 5 18:49:41 2007
- * Copyright 2007 Philippe Rouquier
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Libbrasero-media is free software; you can redistribute it and/or modify
-fy
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BURN_IMAGES_FORMAT_H
@@ -32,18 +37,6 @@
G_BEGIN_DECLS
-typedef enum {
- BRASERO_IMAGE_FORMAT_NONE = 0,
- BRASERO_IMAGE_FORMAT_BIN = 1,
- BRASERO_IMAGE_FORMAT_CUE = 1 << 1,
- BRASERO_IMAGE_FORMAT_CLONE = 1 << 2,
- BRASERO_IMAGE_FORMAT_CDRDAO = 1 << 3,
- BRASERO_IMAGE_FORMAT_ANY = BRASERO_IMAGE_FORMAT_BIN|
- BRASERO_IMAGE_FORMAT_CUE|
- BRASERO_IMAGE_FORMAT_CDRDAO|
- BRASERO_IMAGE_FORMAT_CLONE,
-} BraseroImageFormat;
-
BraseroImageFormat
brasero_image_format_identify_cuesheet (const gchar *path);
Copied: trunk/libbrasero-burn/burn-job.c (from r2117, /trunk/src/burn-job.c)
==============================================================================
--- /trunk/src/burn-job.c (original)
+++ trunk/libbrasero-burn/burn-job.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * job.c
- *
- * dim jan 22 10:40:26 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -43,7 +47,7 @@
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-plugin-private.h"
#include "burn-mkisofs-base.h"
#include "burn-job.h"
Copied: trunk/libbrasero-burn/burn-job.h (from r2117, /trunk/src/burn-job.h)
==============================================================================
--- /trunk/src/burn-job.h (original)
+++ trunk/libbrasero-burn/burn-job.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * job.h
- *
- * dim jan 22 10:40:26 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -31,7 +35,7 @@
#include <glib-object.h>
#include "burn-basics.h"
-#include "burn-track.h"
+#include "brasero-track.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/burn-mkisofs-base.c (from r2117, /trunk/src/burn-mkisofs-base.c)
==============================================================================
--- /trunk/src/burn-mkisofs-base.c (original)
+++ trunk/libbrasero-burn/burn-mkisofs-base.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * mkisofs-case.c
- *
- * mar jan 24 16:41:02 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -44,7 +48,7 @@
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "burn-mkisofs-base.h"
struct _BraseroMkisofsBase {
Copied: trunk/libbrasero-burn/burn-mkisofs-base.h (from r2117, /trunk/src/burn-mkisofs-base.h)
==============================================================================
--- /trunk/src/burn-mkisofs-base.h (original)
+++ trunk/libbrasero-burn/burn-mkisofs-base.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * mkisofs-case.h
- *
- * mar jan 24 16:41:02 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-plugin-manager.c (from r2117, /trunk/src/burn-plugin-manager.c)
==============================================================================
--- /trunk/src/burn-plugin-manager.c (original)
+++ trunk/libbrasero-burn/burn-plugin-manager.c Thu Mar 19 20:22:59 2009
@@ -1,19 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -34,7 +43,7 @@
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-track.h"
+#include "brasero-track.h"
#include "burn-plugin.h"
#include "burn-plugin-private.h"
#include "burn-plugin-manager.h"
Copied: trunk/libbrasero-burn/burn-plugin-manager.h (from r2117, /trunk/src/burn-plugin-manager.h)
==============================================================================
--- /trunk/src/burn-plugin-manager.h (original)
+++ trunk/libbrasero-burn/burn-plugin-manager.h Thu Mar 19 20:22:59 2009
@@ -1,19 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-plugin-private.h (from r2117, /trunk/src/burn-plugin-private.h)
==============================================================================
--- /trunk/src/burn-plugin-private.h (original)
+++ trunk/libbrasero-burn/burn-plugin-private.h Thu Mar 19 20:22:59 2009
@@ -1,25 +1,31 @@
-/***************************************************************************
- * burn-plugin-private.h
- *
- * Mon Feb 12 10:40:55 2007
- * Copyright 2007 Rouquier Philippe
- * <bonfire-app wanadoo fr>
- ****************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BURN_PLUGIN_PRIVATE_H
@@ -29,7 +35,7 @@
#include <glib-object.h>
#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-plugin.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/burn-plugin.c (from r2117, /trunk/src/burn-plugin.c)
==============================================================================
--- /trunk/src/burn-plugin.c (original)
+++ trunk/libbrasero-burn/burn-plugin.c Thu Mar 19 20:22:59 2009
@@ -1,19 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-plugin.h (from r2117, /trunk/src/burn-plugin.h)
==============================================================================
--- /trunk/src/burn-plugin.h (original)
+++ trunk/libbrasero-burn/burn-plugin.h Thu Mar 19 20:22:59 2009
@@ -1,19 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -26,7 +35,8 @@
#include <glib-object.h>
#include "brasero-medium.h"
-#include "burn-track.h"
+#include "brasero-track.h"
+#include "brasero-enums.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/burn-process.c (from r2117, /trunk/src/burn-process.c)
==============================================================================
--- /trunk/src/burn-process.c (original)
+++ trunk/libbrasero-burn/burn-process.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * process.c
- *
- * dim jan 22 10:39:50 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-process.h (from r2117, /trunk/src/burn-process.h)
==============================================================================
--- /trunk/src/burn-process.h (original)
+++ trunk/libbrasero-burn/burn-process.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * process.h
- *
- * dim jan 22 10:39:50 2006
- * Copyright 2006 Rouquier Philippe
- * brasero-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-task-ctx.c (from r2117, /trunk/src/burn-task-ctx.c)
==============================================================================
--- /trunk/src/burn-task-ctx.c (original)
+++ trunk/libbrasero-burn/burn-task-ctx.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -31,7 +39,7 @@
#include <glib/gi18n-lib.h>
#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-debug.h"
#include "burn-task-ctx.h"
Copied: trunk/libbrasero-burn/burn-task-ctx.h (from r2117, /trunk/src/burn-task-ctx.h)
==============================================================================
--- /trunk/src/burn-task-ctx.h (original)
+++ trunk/libbrasero-burn/burn-task-ctx.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -26,7 +34,7 @@
#include <glib-object.h>
#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Copied: trunk/libbrasero-burn/burn-task-item.c (from r2117, /trunk/src/burn-task-item.c)
==============================================================================
--- /trunk/src/burn-task-item.c (original)
+++ trunk/libbrasero-burn/burn-task-item.c Thu Mar 19 20:22:59 2009
@@ -1,17 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.sero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-task-item.h (from r2117, /trunk/src/burn-task-item.h)
==============================================================================
--- /trunk/src/burn-task-item.h (original)
+++ trunk/libbrasero-burn/burn-task-item.h Thu Mar 19 20:22:59 2009
@@ -1,17 +1,28 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2007-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.sero is distributed in the hope that it will be useful,
+ * Libbrasero-burn is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-burn/burn-task.c (from r2117, /trunk/src/burn-task.c)
==============================================================================
--- /trunk/src/burn-task.c (original)
+++ trunk/libbrasero-burn/burn-task.c Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-task.c
- *
- * mer sep 13 09:16:29 2006
- * Copyright 2006 Rouquier Philippe
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -34,7 +38,7 @@
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#include "burn-task.h"
#include "burn-task-item.h"
#include "burn-task-ctx.h"
Copied: trunk/libbrasero-burn/burn-task.h (from r2117, /trunk/src/burn-task.h)
==============================================================================
--- /trunk/src/burn-task.h (original)
+++ trunk/libbrasero-burn/burn-task.h Thu Mar 19 20:22:59 2009
@@ -1,24 +1,28 @@
-/***************************************************************************
- * burn-task.h
- *
- * mer sep 13 09:16:29 2006
- * Copyright 2006 Rouquier Philippe
- * bonfire-app wanadoo fr
- ***************************************************************************/
-
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to:
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Modified: trunk/libbrasero-burn/plugins/cdrdao/Makefile.am
==============================================================================
--- /trunk/src/plugins/cdrdao/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/cdrdao/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/cdrdao/burn-cdrdao.c
==============================================================================
--- /trunk/src/plugins/cdrdao/burn-cdrdao.c (original)
+++ trunk/libbrasero-burn/plugins/cdrdao/burn-cdrdao.c Thu Mar 19 20:22:59 2009
@@ -43,7 +43,7 @@
#include "burn-cdrdao-common.h"
#include "burn-cdrdao.h"
-#include "burn-basics.h"
+#include "brasero-error.h"
#include "burn-plugin.h"
#include "burn-job.h"
#include "burn-process.h"
Modified: trunk/libbrasero-burn/plugins/cdrkit/Makefile.am
==============================================================================
--- /trunk/src/plugins/cdrkit/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/cdrkit/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/cdrtools/Makefile.am
==============================================================================
--- /trunk/src/plugins/cdrtools/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/cdrtools/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/checksum/Makefile.am
==============================================================================
--- /trunk/src/plugins/checksum/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/checksum/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/dvdauthor/Makefile.am
==============================================================================
--- /trunk/src/plugins/dvdauthor/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/dvdauthor/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/dvdcss/Makefile.am
==============================================================================
--- /trunk/src/plugins/dvdcss/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/dvdcss/Makefile.am Thu Mar 19 20:22:59 2009
@@ -4,7 +4,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/growisofs/Makefile.am
==============================================================================
--- /trunk/src/plugins/growisofs/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/growisofs/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/libburnia/Makefile.am
==============================================================================
--- /trunk/src/plugins/libburnia/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/libburnia/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/local-track/Makefile.am
==============================================================================
--- /trunk/src/plugins/local-track/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/local-track/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/transcode/Makefile.am
==============================================================================
--- /trunk/src/plugins/transcode/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/transcode/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/transcode/burn-vob.c
==============================================================================
--- /trunk/src/plugins/transcode/burn-vob.c (original)
+++ trunk/libbrasero-burn/plugins/transcode/burn-vob.c Thu Mar 19 20:22:59 2009
@@ -34,6 +34,7 @@
#include <gst/gst.h>
+#include "brasero-tags.h"
#include "burn-basics.h"
#include "burn-job.h"
#include "burn-plugin.h"
Modified: trunk/libbrasero-burn/plugins/vcdimager/Makefile.am
==============================================================================
--- /trunk/src/plugins/vcdimager/Makefile.am (original)
+++ trunk/libbrasero-burn/plugins/vcdimager/Makefile.am Thu Mar 19 20:22:59 2009
@@ -3,7 +3,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/libbrasero-burn \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/libbrasero-burn/plugins/vcdimager/burn-vcdimager.c
==============================================================================
--- /trunk/src/plugins/vcdimager/burn-vcdimager.c (original)
+++ trunk/libbrasero-burn/plugins/vcdimager/burn-vcdimager.c Thu Mar 19 20:22:59 2009
@@ -35,6 +35,7 @@
#include <libxml/xmlstring.h>
#include <libxml/uri.h>
+#include "brasero-tags.h"
#include "burn-basics.h"
#include "burn-plugin.h"
#include "burn-job.h"
Modified: trunk/libbrasero-media/Makefile.am
==============================================================================
--- trunk/libbrasero-media/Makefile.am (original)
+++ trunk/libbrasero-media/Makefile.am Thu Mar 19 20:22:59 2009
@@ -1,7 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/src/ \
+ -I$(top_srcdir)/libbrasero-burn/ \
-I$(top_builddir) \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
@@ -23,7 +23,7 @@
libbrasero-marshal.c: libbrasero-marshal.h
( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --body --header > libbrasero-marshal.c )
-lib_LTLIBRARIES = \
+lib_LTLIBRARIES = \
libbrasero-media.la
libbraseromediaincludedir = $(pkgincludedir)/
Modified: trunk/libbrasero-media/brasero-media.h.in
==============================================================================
--- trunk/libbrasero-media/brasero-media.h.in (original)
+++ trunk/libbrasero-media/brasero-media.h.in Thu Mar 19 20:22:59 2009
@@ -1,22 +1,22 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero
+ * Libbrasero-media
* Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-media is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * The Brasero authors hereby grant permission for non-GPL compatible
+ * The Libbrasero-media authors hereby grant permission for non-GPL compatible
* GStreamer plugins to be used and distributed together with GStreamer
- * and Brasero. This permission is above and beyond the permissions granted
- * by the GPL license by which Brasero is covered. If you modify this code
+ * and Libbrasero-media. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-media is covered. If you modify this code
* you may extend this exception to your version of the code, but you are not
* obligated to do so. If you do not wish to do so, delete this exception
* statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-media is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
Modified: trunk/libbrasero-media/brasero-medium.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium.c (original)
+++ trunk/libbrasero-media/brasero-medium.c Thu Mar 19 20:22:59 2009
@@ -42,7 +42,7 @@
#include <glib/gi18n-lib.h>
#include <gdk/gdk.h>
-#include "burn-basics.h"
+#include "brasero-enums.h"
#include "brasero-media-private.h"
Added: trunk/libbrasero-utils/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/libbrasero-utils/Makefile.am Thu Mar 19 20:22:59 2009
@@ -0,0 +1,60 @@
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+ -DBRASERO_LIBDIR=\"$(libdir)\" \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+ $(BRASERO_GTK_CFLAGS) \
+ $(BRASERO_SM_CFLAGS)
+
+lib_LTLIBRARIES = \
+ libbrasero-utils.la
+
+libbrasero_utils_la_LIBADD = \
+ $(BRASERO_GLIB_LIBS) \
+ $(BRASERO_GTK_LIBS) \
+ $(BRASERO_SM_LIBS)
+
+libbrasero_utils_la_LDFLAGS = \
+ -version-info $(LIBBRASERO_LT_VERSION) \
+ -no-undefined \
+ $(AM_LDFLAGS)
+# -export-symbols ./libbrasero-utils.symbols
+
+libbrasero_utils_la_SOURCES = \
+ brasero-disc-message.c \
+ brasero-disc-message.h \
+ brasero-misc.c \
+ brasero-misc.h \
+ brasero-notify.c \
+ brasero-notify.h \
+ brasero-jacket-background.c \
+ brasero-jacket-background.h \
+ brasero-jacket-buffer.c \
+ brasero-jacket-buffer.h \
+ brasero-jacket-edit.c \
+ brasero-jacket-edit.h \
+ brasero-jacket-font.c \
+ brasero-jacket-font.h \
+ brasero-jacket-view.c \
+ brasero-jacket-view.h \
+ brasero-tool-color-picker.c \
+ brasero-tool-color-picker.h \
+ eggdesktopfile.c \
+ eggdesktopfile.h \
+ eggsmclient.c \
+ eggsmclient.h \
+ eggsmclient-private.h \
+ eggsmclient-xsmp.c
+
+# EXTRA_DIST = \
+# libbrasero-utils.symbols
+
+CLEANFILES = \
+ $(RECMARSHALFILES)
+
Copied: trunk/libbrasero-utils/brasero-disc-message.c (from r2117, /trunk/src/brasero-disc-message.c)
==============================================================================
--- /trunk/src/brasero-disc-message.c (original)
+++ trunk/libbrasero-utils/brasero-disc-message.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-utils/brasero-disc-message.h (from r2117, /trunk/src/brasero-disc-message.h)
==============================================================================
--- /trunk/src/brasero-disc-message.h (original)
+++ trunk/libbrasero-utils/brasero-disc-message.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-utils/brasero-jacket-background.c (from r2117, /trunk/src/brasero-jacket-background.c)
==============================================================================
--- /trunk/src/brasero-jacket-background.c (original)
+++ trunk/libbrasero-utils/brasero-jacket-background.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Copied: trunk/libbrasero-utils/brasero-jacket-background.h (from r2117, /trunk/src/brasero-jacket-background.h)
==============================================================================
--- /trunk/src/brasero-jacket-background.h (original)
+++ trunk/libbrasero-utils/brasero-jacket-background.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_JACKET_BACKGROUND_H_
Copied: trunk/libbrasero-utils/brasero-jacket-buffer.c (from r2117, /trunk/src/brasero-jacket-buffer.c)
==============================================================================
--- /trunk/src/brasero-jacket-buffer.c (original)
+++ trunk/libbrasero-utils/brasero-jacket-buffer.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#include <gtk/gtk.h>
Copied: trunk/libbrasero-utils/brasero-jacket-buffer.h (from r2117, /trunk/src/brasero-jacket-buffer.h)
==============================================================================
--- /trunk/src/brasero-jacket-buffer.h (original)
+++ trunk/libbrasero-utils/brasero-jacket-buffer.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_JACKET_BUFFER_H_
Copied: trunk/libbrasero-utils/brasero-jacket-edit.c (from r2117, /trunk/src/brasero-jacket-edit.c)
==============================================================================
--- /trunk/src/brasero-jacket-edit.c (original)
+++ trunk/libbrasero-utils/brasero-jacket-edit.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Rouquier Philippe 2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -29,15 +37,13 @@
#include <gtk/gtk.h>
+#include "brasero-misc.h"
#include "brasero-jacket-edit.h"
#include "brasero-jacket-buffer.h"
#include "brasero-jacket-view.h"
#include "brasero-jacket-font.h"
-#include "brasero-utils.h"
#include "brasero-tool-color-picker.h"
-#include "burn-track.h"
-
typedef struct _BraseroJacketEditPrivate BraseroJacketEditPrivate;
struct _BraseroJacketEditPrivate
{
@@ -724,161 +730,46 @@
}
}
-#define BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT(buffer_MACRO, text_MACRO, tag_MACRO, start_MACRO) \
- gtk_text_buffer_insert_with_tags_by_name (buffer_MACRO, start_MACRO, text_MACRO, -1, tag_MACRO, NULL);
-
void
-brasero_jacket_edit_set_audio_tracks (BraseroJacketEdit *self,
- const gchar *label,
- const gchar *cover,
- GSList *tracks)
+brasero_jacket_edit_freeze (BraseroJacketEdit *self)
{
BraseroJacketEditPrivate *priv;
- GtkTextBuffer *buffer;
- GtkTextIter start;
- GSList *iter;
priv = BRASERO_JACKET_EDIT_PRIVATE (self);
g_signal_handlers_block_by_func (priv->front, brasero_jacket_edit_tags_changed_cb, self);
g_signal_handlers_block_by_func (priv->back, brasero_jacket_edit_tags_changed_cb, self);
+}
- /* set background for front cover */
- if (cover) {
- gchar *path;
-
- path = g_filename_from_uri (cover, NULL, NULL);
- if (!path)
- path = g_strdup (cover);
-
- brasero_jacket_view_set_image_style (BRASERO_JACKET_VIEW (priv->front), BRASERO_JACKET_IMAGE_STRETCH);
- brasero_jacket_view_set_image (BRASERO_JACKET_VIEW (priv->front), path);
- g_free (path);
- }
-
- /* create the tags for front cover */
- if (label) {
- buffer = brasero_jacket_view_get_body_buffer (BRASERO_JACKET_VIEW (priv->front));
-
- gtk_text_buffer_create_tag (buffer,
- "Title",
- "justification", GTK_JUSTIFY_CENTER,
- "weight", PANGO_WEIGHT_BOLD,
- "size", 14 * PANGO_SCALE,
- NULL);
-
- gtk_text_buffer_get_start_iter (buffer, &start);
-
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n\n\n", "Title", &start);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
- }
-
- /* create the tags for back cover */
- buffer = brasero_jacket_view_get_body_buffer (BRASERO_JACKET_VIEW (priv->back));
-
- gtk_text_buffer_create_tag (buffer,
- "Title",
- "justification", GTK_JUSTIFY_CENTER,
- "weight", PANGO_WEIGHT_BOLD,
- "size", 12 * PANGO_SCALE,
- NULL);
- gtk_text_buffer_create_tag (buffer,
- "Subtitle",
- "justification", GTK_JUSTIFY_LEFT,
- "weight", PANGO_WEIGHT_NORMAL,
- "size", 10 * PANGO_SCALE,
- NULL);
- gtk_text_buffer_create_tag (buffer,
- "Artist",
- "weight", PANGO_WEIGHT_NORMAL,
- "justification", GTK_JUSTIFY_LEFT,
- "size", 8 * PANGO_SCALE,
- "style", PANGO_STYLE_ITALIC,
- NULL);
-
- gtk_text_buffer_get_start_iter (buffer, &start);
-
- if (label) {
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Title", &start);
- }
+void
+brasero_jacket_edit_thaw (BraseroJacketEdit *self)
+{
+ BraseroJacketEditPrivate *priv;
- for (iter = tracks; iter; iter = iter->next) {
- gchar *num;
- gchar *time;
- BraseroTrack *track;
- BraseroSongInfo *info;
-
- track = iter->data;
- if (brasero_track_get_type (track, NULL) != BRASERO_TRACK_TYPE_AUDIO)
- continue;
-
- num = g_strdup_printf ("%i - ", g_slist_index (tracks, track) + 1);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, num, "Subtitle", &start);
- g_free (num);
-
- info = brasero_track_get_audio_info (track);
-
- if (info) {
- if (info->title) {
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->title, "Subtitle", &start);
- }
- else {
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("Unknown song"), "Subtitle", &start);
- }
-
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\t\t", "Subtitle", &start);
-
- time = brasero_units_get_time_string (brasero_track_get_audio_end (track) -
- brasero_track_get_audio_start (track),
- TRUE,
- FALSE);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, time, "Subtitle", &start);
- g_free (time);
-
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n", "Subtitle", &start);
-
- if (info->artist) {
- /* Reminder: if this string happens to be used
- * somewhere else in brasero we'll need a
- * context with C_() macro */
- /* Translators: "by" is followed by the name of an artist.
- * This text is the one written on the cover of a disc.
- * Before it there is the name of the song.
- * I had to break it because it is in a GtkTextBuffer
- * and every word has a different tag. */
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("by"), "Artist", &start);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->artist, "Artist", &start);
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
- }
+ priv = BRASERO_JACKET_EDIT_PRIVATE (self);
- if (info->composer)
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->composer, "Subtitle", &start);
+ g_signal_handlers_unblock_by_func (priv->front, brasero_jacket_edit_tags_changed_cb, self);
+ g_signal_handlers_unblock_by_func (priv->back, brasero_jacket_edit_tags_changed_cb, self);
+}
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n\n", "Subtitle", &start);
- }
- }
+BraseroJacketView *
+brasero_jacket_edit_get_front (BraseroJacketEdit *self)
+{
+ BraseroJacketEditPrivate *priv;
- /* side */
- buffer = brasero_jacket_view_get_side_buffer (BRASERO_JACKET_VIEW (priv->back));
+ priv = BRASERO_JACKET_EDIT_PRIVATE (self);
- /* create the tags for sides */
- gtk_text_buffer_create_tag (buffer,
- "Title",
- "justification", GTK_JUSTIFY_CENTER,
- "weight", PANGO_WEIGHT_BOLD,
- "size", 10 * PANGO_SCALE,
- NULL);
+ return BRASERO_JACKET_VIEW (priv->front);
+}
- gtk_text_buffer_get_start_iter (buffer, &start);
+BraseroJacketView *
+brasero_jacket_edit_get_back (BraseroJacketEdit *self)
+{
+ BraseroJacketEditPrivate *priv;
- if (label) {
- BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, label, "Title", &start);
- }
+ priv = BRASERO_JACKET_EDIT_PRIVATE (self);
- g_signal_handlers_unblock_by_func (priv->front, brasero_jacket_edit_tags_changed_cb, self);
- g_signal_handlers_unblock_by_func (priv->back, brasero_jacket_edit_tags_changed_cb, self);
+ return BRASERO_JACKET_VIEW (priv->back);
}
static void
Copied: trunk/libbrasero-utils/brasero-jacket-edit.h (from r2117, /trunk/src/brasero-jacket-edit.h)
==============================================================================
--- /trunk/src/brasero-jacket-edit.h (original)
+++ trunk/libbrasero-utils/brasero-jacket-edit.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Rouquier Philippe 2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -27,6 +35,8 @@
#include <gtk/gtk.h>
+#include "brasero-jacket-view.h"
+
G_BEGIN_DECLS
#define BRASERO_TYPE_JACKET_EDIT (brasero_jacket_edit_get_type ())
@@ -59,10 +69,16 @@
BraseroJacketEdit **contents);
void
-brasero_jacket_edit_set_audio_tracks (BraseroJacketEdit *self,
- const gchar *label,
- const gchar *cover,
- GSList *tracks);
+brasero_jacket_edit_freeze (BraseroJacketEdit *self);
+
+void
+brasero_jacket_edit_thaw (BraseroJacketEdit *self);
+
+BraseroJacketView *
+brasero_jacket_edit_get_front (BraseroJacketEdit *self);
+
+BraseroJacketView *
+brasero_jacket_edit_get_back (BraseroJacketEdit *self);
G_END_DECLS
Copied: trunk/libbrasero-utils/brasero-jacket-font.c (from r2117, /trunk/src/brasero-jacket-font.c)
==============================================================================
--- /trunk/src/brasero-jacket-font.c (original)
+++ trunk/libbrasero-utils/brasero-jacket-font.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#include <string.h>
Copied: trunk/libbrasero-utils/brasero-jacket-font.h (from r2117, /trunk/src/brasero-jacket-font.h)
==============================================================================
--- /trunk/src/brasero-jacket-font.h (original)
+++ trunk/libbrasero-utils/brasero-jacket-font.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_JACKET_FONT_H_
Copied: trunk/libbrasero-utils/brasero-jacket-view.c (from r2117, /trunk/src/brasero-jacket-view.c)
==============================================================================
--- /trunk/src/brasero-jacket-view.c (original)
+++ trunk/libbrasero-utils/brasero-jacket-view.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with braserojacketview. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
@@ -33,7 +41,8 @@
#include "brasero-jacket-view.h"
#include "brasero-jacket-buffer.h"
-#include "brasero-utils.h"
+
+#include "brasero-misc.h"
typedef struct _BraseroJacketViewPrivate BraseroJacketViewPrivate;
struct _BraseroJacketViewPrivate
Copied: trunk/libbrasero-utils/brasero-jacket-view.h (from r2117, /trunk/src/brasero-jacket-view.h)
==============================================================================
--- /trunk/src/brasero-jacket-view.h (original)
+++ trunk/libbrasero-utils/brasero-jacket-view.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,28 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with brasero. If not, write to:
+ * along with this program; if not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
Copied: trunk/libbrasero-utils/brasero-misc.c (from r2117, /trunk/src/brasero-utils.c)
==============================================================================
--- /trunk/src/brasero-utils.c (original)
+++ trunk/libbrasero-utils/brasero-misc.c Thu Mar 19 20:22:59 2009
@@ -1,10 +1,22 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
@@ -15,14 +27,6 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
-/***************************************************************************
- * utils.c
- *
- * Wed May 18 16:58:16 2005
- * Copyright 2005 Philippe Rouquier
- * <brasero-app wanadoo fr>
- ****************************************************************************/
-
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -38,149 +42,7 @@
#include <gtk/gtk.h>
-#include <gst/gst.h>
-
-#include "brasero-app.h"
-#include "brasero-utils.h"
-#include "brasero-data-tree-model.h"
-
-#define BRASERO_ERROR brasero_error_quark()
-
-static GHashTable *stringsH = NULL;
-G_LOCK_DEFINE_STATIC (stringsH);
-
-static gboolean
-brasero_utils_clear_strings_cb (gchar *string,
- guint ref,
- gpointer NULL_data)
-{
- g_free (string);
- return TRUE;
-}
-
-static void
-brasero_utils_free (void)
-{
- if (stringsH) {
- G_LOCK (stringsH);
- g_hash_table_foreach_remove (stringsH,
- (GHRFunc) brasero_utils_clear_strings_cb,
- NULL);
- g_hash_table_destroy (stringsH);
- stringsH = NULL;
- G_UNLOCK (stringsH);
- }
-}
-
-GQuark
-brasero_error_quark (void)
-{
- static GQuark quark = 0;
-
- if (!quark)
- quark = g_quark_from_static_string ("BraSero_error");
-
- return quark;
-}
-
-void
-brasero_utils_init (void)
-{
- /* This function does two things:
- * - register brasero icons
- * - load all the gid of the user
- */
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- BRASERO_DATADIR "/icons");
-
- g_atexit (brasero_utils_free);
-}
-
-/**
- * Allows multiple uses of the same string
- */
-
-gchar *
-brasero_utils_register_string (const gchar *string)
-{
- gboolean success;
- gpointer key, reftmp;
- guint ref;
-
- if (!string) {
- g_warning ("Null string to be registered");
- return NULL;
- }
-
- G_LOCK (stringsH);
-
- if (!stringsH) {
- stringsH = g_hash_table_new (g_str_hash, g_str_equal);
- success = FALSE;
- }
- else
- success = g_hash_table_lookup_extended (stringsH,
- string,
- &key,
- &reftmp);
-
- if (!success) {
- key = g_strdup (string);
- g_hash_table_insert (stringsH,
- key,
- GINT_TO_POINTER (1));
- G_UNLOCK (stringsH);
- return key;
- }
-
- ref = GPOINTER_TO_INT(reftmp) + 1;
- g_hash_table_insert (stringsH,
- key,
- GINT_TO_POINTER (ref));
-
- G_UNLOCK (stringsH);
- return key;
-}
-
-void
-brasero_utils_unregister_string (const gchar *string)
-{
- gboolean success;
- gpointer key, reftmp;
- guint ref;
-
- if (!string) {
- g_warning ("Null string to be unregistered");
- return;
- }
-
- G_LOCK (stringsH);
-
- if (!stringsH) {
- G_UNLOCK (stringsH);
- return;
- }
-
- success = g_hash_table_lookup_extended (stringsH,
- string,
- &key,
- &reftmp);
- if (!success) {
- G_UNLOCK (stringsH);
- return;
- }
-
- ref = GPOINTER_TO_INT(reftmp) - 1;
-
- if (ref > 0)
- g_hash_table_insert (stringsH, key, GINT_TO_POINTER (ref));
- else if (ref <= 0) {
- g_hash_table_remove (stringsH, string);
- g_free (key);
- }
-
- G_UNLOCK (stringsH);
-}
+#include "brasero-misc.h"
GtkWidget *
brasero_utils_pack_properties_list (const gchar *title, GSList *list)
@@ -284,34 +146,6 @@
return button;
}
-void
-brasero_utils_launch_app (GtkWidget *widget,
- GSList *list)
-{
- GSList *item;
-
- for (item = list; item; item = item->next) {
- GError *error;
- gchar *uri;
-
- error = NULL;
- uri = item->data;
-
- if (!g_app_info_launch_default_for_uri (uri, NULL, &error)) {
- gchar *string;
-
- string = g_strdup_printf ("\"%s\" could not be opened", uri);
- brasero_app_alert (brasero_app_get_default (),
- string,
- error->message,
- GTK_MESSAGE_ERROR);
- g_free (string);
- g_error_free (error);
- continue;
- }
- }
-}
-
gchar*
brasero_utils_validate_utf8 (const gchar *name)
{
Copied: trunk/libbrasero-utils/brasero-misc.h (from r2117, /trunk/src/brasero-utils.h)
==============================================================================
--- /trunk/src/brasero-utils.h (original)
+++ trunk/libbrasero-utils/brasero-misc.h Thu Mar 19 20:22:59 2009
@@ -1,10 +1,22 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Brasero is free software; you can redistribute it and/or modify
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * Brasero is distributed in the hope that it will be useful,
+ * Libbrasero-misc is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
@@ -16,51 +28,17 @@
* Boston, MA 02110-1301, USA.
*/
-/***************************************************************************
- * utils.h
- *
- * Wed May 18 16:58:16 2005
- * Copyright 2005 Philippe Rouquier
- * <brasero-app wanadoo fr>
- ****************************************************************************/
-
-
#include <sys/types.h>
#include <unistd.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include "burn-basics.h"
-
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef _MISC_H
+#define _MISC_H
G_BEGIN_DECLS
-#define BRASERO_ERROR brasero_error_quark()
-
-typedef char *(*BraseroFormatTime) (double time,
- gboolean with_unit,
- gboolean round);
-
-typedef enum {
- BRASERO_ERROR_NONE,
- BRASERO_ERROR_GENERAL,
- BRASERO_ERROR_SYMLINK_LOOP
-} BraseroErrors;
-
-#define BRASERO_DEFAULT_ICON "text-x-preview"
-
-void brasero_utils_init (void);
-
-GQuark brasero_error_quark (void);
-
-gchar *
-brasero_utils_register_string (const gchar *string);
-void
-brasero_utils_unregister_string (const gchar *string);
-
GtkWidget *
brasero_utils_pack_properties (const gchar *title, ...);
GtkWidget *
@@ -71,10 +49,6 @@
const gchar *theme,
GtkIconSize size);
-void
-brasero_utils_launch_app (GtkWidget *widget,
- GSList *list);
-
gchar*
brasero_utils_validate_utf8 (const gchar *name);
@@ -92,4 +66,4 @@
G_END_DECLS
-#endif /* _UTILS_H */
+#endif /* _MISC_H */
Copied: trunk/libbrasero-utils/brasero-notify.c (from r2117, /trunk/src/brasero-notify.c)
==============================================================================
--- /trunk/src/brasero-notify.c (original)
+++ trunk/libbrasero-utils/brasero-notify.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Copied: trunk/libbrasero-utils/brasero-notify.h (from r2117, /trunk/src/brasero-notify.h)
==============================================================================
--- /trunk/src/brasero-notify.h (original)
+++ trunk/libbrasero-utils/brasero-notify.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_NOTIFY_H_
Copied: trunk/libbrasero-utils/brasero-tool-color-picker.c (from r2117, /trunk/src/brasero-tool-color-picker.c)
==============================================================================
--- /trunk/src/brasero-tool-color-picker.c (original)
+++ trunk/libbrasero-utils/brasero-tool-color-picker.c Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
Copied: trunk/libbrasero-utils/brasero-tool-color-picker.h (from r2117, /trunk/src/brasero-tool-color-picker.h)
==============================================================================
--- /trunk/src/brasero-tool-color-picker.h (original)
+++ trunk/libbrasero-utils/brasero-tool-color-picker.h Thu Mar 19 20:22:59 2009
@@ -1,20 +1,31 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * brasero
- * Copyright (C) Philippe Rouquier 2008 <bonfire-app wanadoo fr>
- *
- * brasero is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Libbrasero-misc
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-misc is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
+ *
+ * The Libbrasero-misc authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-misc. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
*
- * brasero is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * Libbrasero-misc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_TOOL_COLOR_PICKER_H_
Modified: trunk/nautilus/nautilus-burn-extension.c
==============================================================================
--- trunk/nautilus/nautilus-burn-extension.c (original)
+++ trunk/nautilus/nautilus-burn-extension.c Thu Mar 19 20:22:59 2009
@@ -128,7 +128,6 @@
static void
launch_brasero_on_window (GtkWindow *window)
{
- int i;
GPtrArray *argv = NULL;
argv = g_ptr_array_new ();
@@ -153,7 +152,6 @@
GPtrArray *argv = NULL;
char *uri;
char *image_path;
- int i;
file_info = g_object_get_data (G_OBJECT (item), "file_info");
@@ -180,7 +178,6 @@
copy_disc_activate_cb (NautilusMenuItem *item,
gpointer user_data)
{
- int i;
GPtrArray *argv = NULL;
char *device_path;
@@ -203,7 +200,6 @@
blank_disc_activate_cb (NautilusMenuItem *item,
gpointer user_data)
{
- int i;
GPtrArray *argv = NULL;
char *device_path;
@@ -226,7 +222,6 @@
check_disc_activate_cb (NautilusMenuItem *item,
gpointer user_data)
{
- int i;
GPtrArray *argv = NULL;
char *device_path;
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Thu Mar 19 20:22:59 2009
@@ -1,6 +1,34 @@
# List of source files containing translatable strings.
[encoding: UTF-8]
+libbrasero-burn/brasero-burn-dialog.c
+libbrasero-burn/brasero-burn-options.c
+libbrasero-burn/brasero-burn.c
+libbrasero-burn/brasero-cover.c
+libbrasero-burn/brasero-dest-selection.c
+libbrasero-burn/brasero-disc-copy-dialog.c
+libbrasero-burn/brasero-disc-option-dialog.c
+libbrasero-burn/brasero-drive-properties.c
+libbrasero-burn/brasero-image-option-dialog.c
+libbrasero-burn/brasero-image-properties.c
+libbrasero-burn/brasero-image-type-chooser.c
+libbrasero-burn/brasero-medium-properties.c
+libbrasero-burn/brasero-progress.c
+libbrasero-burn/brasero-session.c
+libbrasero-burn/brasero-src-image.c
+libbrasero-burn/brasero-tray.c
+libbrasero-burn/burn-basics.c
+libbrasero-burn/burn-caps.c
+libbrasero-burn/burn-job.c
+libbrasero-burn/burn-mkisofs-base.c
+libbrasero-burn/burn-process.c
+libbrasero-utils/brasero-disc-message.c
+libbrasero-utils/brasero-jacket-background.c
+libbrasero-utils/brasero-jacket-edit.c
+libbrasero-utils/brasero-jacket-view.c
+libbrasero-utils/brasero-tool-color-picker.c
+libbrasero-utils/eggdesktopfile.c
+libbrasero-utils/eggsmclient.c
src/brasero-project-parse.c
libbrasero-media/brasero-drive-selection.c
libbrasero-media/brasero-media.c
@@ -12,46 +40,30 @@
libbrasero-media/brasero-volume.c
libbrasero-media/burn-volume.c
libbrasero-media/scsi-error.c
-src/eggdesktopfile.c
-src/eggsmclient.c
-src/brasero-tool-color-picker.c
src/brasero-video-project.c
src/brasero-pref.c
-src/plugins/local-track/burn-uri.c
+libbrasero-burn/plugins/local-track/burn-uri.c
nautilus/brasero-nautilus.desktop.in.in
nautilus/nautilus-burn-bar.c
nautilus/nautilus-burn-extension.c
-src/brasero-medium-properties.c
-src/brasero-src-image.c
src/brasero-project-name.c
-src/brasero-burn-options.c
src/brasero-app.c
data/brasero.desktop.in.in
data/brasero.schemas.in
data/brasero.xml.in
-src/brasero-dest-selection.c
src/brasero-audio-disc.c
src/brasero-blank-dialog.c
-src/brasero-disc-copy-dialog.c
src/brasero-metadata.c
src/brasero-mime-filter.c
src/brasero-playlist.c
src/brasero-plugin-manager-ui.c
src/brasero-plugin-option.c
-src/brasero-progress.c
src/brasero-search-entry.c
src/brasero-search-beagle.c
src/brasero-song-properties.c
-src/brasero-tray.c
src/brasero-utils.c
-src/brasero-burn-dialog.c
src/brasero-data-disc.c
-src/brasero-disc-option-dialog.c
-src/brasero-drive-properties.c
src/brasero-file-chooser.c
-src/brasero-image-option-dialog.c
-src/brasero-image-properties.c
-src/brasero-image-type-chooser.c
src/brasero-layout.c
src/brasero-player.c
src/brasero-project.c
@@ -59,66 +71,51 @@
src/brasero-project-type-chooser.c
src/brasero-sum-dialog.c
src/brasero-tool-dialog.c
-src/burn-basics.c
-src/burn.c
-src/burn-caps.c
-src/burn-job.c
-src/burn-mkisofs-base.c
-src/burn-process.c
-src/burn-session.c
-src/burn-task-ctx.c
-src/burn-track.c
src/main.c
-src/plugins/cdrdao/burn-cdrdao.c
-src/plugins/cdrdao/burn-toc2cue.c
-src/plugins/cdrkit/burn-genisoimage.c
-src/plugins/cdrkit/burn-readom.c
-src/plugins/cdrkit/burn-wodim.c
-src/plugins/cdrtools/burn-cdrecord.c
-src/plugins/cdrtools/burn-mkisofs.c
-src/plugins/cdrtools/burn-readcd.c
-src/plugins/dvdcss/burn-dvdcss.c
-src/plugins/growisofs/burn-dvd-rw-format.c
-src/plugins/growisofs/burn-growisofs.c
-src/plugins/libburnia/burn-libburn.c
-src/plugins/libburnia/burn-libburn-common.c
-src/plugins/libburnia/burn-libisofs.c
-src/plugins/local-track/burn-local-image.c
-src/plugins/transcode/burn-normalize.c
-src/plugins/transcode/burn-transcode.c
+libbrasero-burn/plugins/cdrdao/burn-cdrdao.c
+libbrasero-burn/plugins/cdrdao/burn-toc2cue.c
+libbrasero-burn/plugins/cdrkit/burn-genisoimage.c
+libbrasero-burn/plugins/cdrkit/burn-readom.c
+libbrasero-burn/plugins/cdrkit/burn-wodim.c
+libbrasero-burn/plugins/cdrtools/burn-cdrecord.c
+libbrasero-burn/plugins/cdrtools/burn-mkisofs.c
+libbrasero-burn/plugins/cdrtools/burn-readcd.c
+libbrasero-burn/plugins/dvdcss/burn-dvdcss.c
+libbrasero-burn/plugins/growisofs/burn-dvd-rw-format.c
+libbrasero-burn/plugins/growisofs/burn-growisofs.c
+libbrasero-burn/plugins/libburnia/burn-libburn.c
+libbrasero-burn/plugins/libburnia/burn-libburn-common.c
+libbrasero-burn/plugins/libburnia/burn-libisofs.c
+libbrasero-burn/plugins/local-track/burn-local-image.c
+libbrasero-burn/plugins/transcode/burn-normalize.c
+libbrasero-burn/plugins/transcode/burn-transcode.c
src/brasero-preview.c
src/brasero-split-dialog.c
src/brasero-time-button.c
-src/brasero-src-selection.c
-src/plugins/cdrkit/burn-cdrkit.h
-src/plugins/libburnia/burn-libburnia.h
-src/plugins/growisofs/burn-growisofs-common.h
-src/plugins/cdrdao/burn-cdrdao-common.h
-src/plugins/cdrtools/burn-cdrtools.h
-src/burn-image-format.c
+libbrasero-burn/brasero-src-selection.c
+libbrasero-burn/plugins/cdrkit/burn-cdrkit.h
+libbrasero-burn/plugins/libburnia/burn-libburnia.h
+libbrasero-burn/plugins/growisofs/burn-growisofs-common.h
+libbrasero-burn/plugins/cdrdao/burn-cdrdao-common.h
+libbrasero-burn/plugins/cdrtools/burn-cdrtools.h
+libbrasero-burn/burn-image-format.c
src/brasero-data-session.c
src/brasero-data-tree-model.c
-src/brasero-disc-message.c
src/brasero-disc.c
src/brasero-eject-dialog.c
src/brasero-file-filtered.c
src/brasero-filter-option.c
-src/brasero-data-vfs.c
src/brasero-io.c
src/brasero-data-vfs.c
-src/brasero-io.c
-src/plugins/checksum/burn-checksum-files.c
-src/plugins/checksum/burn-checksum-image.c
-src/brasero-jacket-background.c
-src/brasero-jacket-view.c
-src/brasero-jacket-edit.c
+libbrasero-burn/plugins/checksum/burn-checksum-files.c
+libbrasero-burn/plugins/checksum/burn-checksum-image.c
src/brasero-multi-song-props.c
src/brasero-rename.c
src/brasero-video-disc.c
src/brasero-video-tree-model.c
-src/plugins/dvdauthor/burn-dvdauthor.c
-src/plugins/transcode/burn-vob.c
-src/plugins/vcdimager/burn-vcdimager.c
+libbrasero-burn/plugins/dvdauthor/burn-dvdauthor.c
+libbrasero-burn/plugins/transcode/burn-vob.c
+libbrasero-burn/plugins/vcdimager/burn-vcdimager.c
data/brasero-copy-medium.desktop.in.in
data/brasero-open-image.desktop.in.in
data/brasero-open-playlist.desktop.in.in
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Mar 19 20:22:59 2009
@@ -1,9 +1,12 @@
-SUBDIRS = plugins
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/libbrasero-media/ \
+ -I$(top_srcdir)/libbrasero-utils/ \
+ -I$(top_builddir)/libbrasero-utils/ \
+ -I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir)/libbrasero-media/ \
+ -I$(top_srcdir)/libbrasero-burn/ \
+ -I$(top_builddir)/libbrasero-burn/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -15,10 +18,8 @@
$(BRASERO_GCONF_CFLAGS) \
$(BRASERO_GSTREAMER_CFLAGS) \
$(BRASERO_GSTREAMER_BASE_CFLAGS) \
- $(BRASERO_SM_CFLAGS) \
$(BRASERO_GTK_CFLAGS) \
$(BRASERO_DBUS_CFLAGS) \
- $(BRASERO_GMODULE_CFLAGS) \
$(BRASERO_LIBXML_CFLAGS) \
$(BRASERO_BEAGLE_CFLAGS) \
$(BRASERO_PL_PARSER_CFLAGS)
@@ -39,8 +40,6 @@
main.c \
brasero-utils.h \
brasero-utils.c \
- burn-dbus.h \
- burn-dbus.c \
brasero-search-entry.c \
brasero-search-entry.h \
brasero-search-beagle.c \
@@ -51,10 +50,6 @@
brasero-playlist.h \
brasero-player.c \
brasero-player.h \
- brasero-burn-dialog.c \
- brasero-burn-dialog.h \
- brasero-disc-copy-dialog.c \
- brasero-disc-copy-dialog.h \
brasero-blank-dialog.c \
brasero-blank-dialog.h \
brasero-eject-dialog.c \
@@ -71,24 +66,8 @@
brasero-project-type-chooser.h \
brasero-player-bacon.c \
brasero-player-bacon.h \
- brasero-progress.c \
- brasero-progress.h \
brasero-song-properties.c \
brasero-song-properties.h \
- brasero-tray.c \
- brasero-tray.h \
- burn.c \
- burn.h \
- burn-job.c \
- burn-job.h \
- burn-process.c \
- burn-process.h \
- burn-basics.h \
- burn-basics.c \
- burn-caps.c \
- burn-caps.h \
- brasero-session.c \
- brasero-session.h \
brasero-uri-container.c \
brasero-uri-container.h \
brasero-project-manager.c \
@@ -97,51 +76,20 @@
brasero-layout.h \
brasero-file-chooser.c \
brasero-file-chooser.h \
- burn-session.h \
brasero-sum-dialog.c \
brasero-sum-dialog.h \
brasero-tool-dialog.c \
brasero-tool-dialog.h \
- burn-task.c \
- burn-task.h \
brasero-async-task-manager.c \
brasero-async-task-manager.h \
eggtreemultidnd.c \
eggtreemultidnd.h \
brasero-multi-dnd.c \
brasero-multi-dnd.h \
- brasero-image-option-dialog.c \
- brasero-image-option-dialog.h \
- brasero-disc-option-dialog.c \
- brasero-disc-option-dialog.h \
- brasero-image-type-chooser.c \
- brasero-image-type-chooser.h \
brasero-layout-object.c \
brasero-layout-object.h \
- burn-track.h \
- burn-plugin.h \
- burn-plugin.c \
- burn-plugin-private.h \
- burn-plugin-manager.c \
- burn-plugin-manager.h \
- burn-task-ctx.h \
- burn-task-item.c \
- burn-task-item.h \
- burn-task-ctx.c \
- burn-mkisofs-base.c \
- burn-mkisofs-base.h \
- brasero-src-selection.h \
- brasero-src-selection.c \
- brasero-dest-selection.h \
- brasero-dest-selection.c \
- brasero-drive-properties.h \
- brasero-drive-properties.c \
- brasero-image-properties.h \
- brasero-image-properties.c \
brasero-xfer.c \
brasero-xfer.h \
- burn-session.c \
- burn-track.c \
brasero-plugin-manager-ui.c \
brasero-plugin-manager-ui.h \
brasero-pref.h \
@@ -154,8 +102,6 @@
brasero-time-button.c \
brasero-preview.h \
brasero-preview.c \
- burn-image-format.c \
- burn-image-format.h \
brasero-data-project.c \
brasero-data-project.h \
brasero-data-session.c \
@@ -172,28 +118,14 @@
brasero-file-filtered.c \
brasero-filter-option.h \
brasero-filter-option.c \
- brasero-disc-message.h \
- brasero-disc-message.c \
baobab-cell-renderer-progress.c \
baobab-cell-renderer-progress.h \
brasero-io.h \
brasero-io.c \
- brasero-jacket-background.c \
- brasero-jacket-background.h \
- brasero-jacket-buffer.c \
- brasero-jacket-buffer.h \
- brasero-jacket-edit.c \
- brasero-jacket-edit.h \
- brasero-jacket-font.c \
- brasero-jacket-font.h \
- brasero-jacket-view.c \
- brasero-jacket-view.h \
brasero-multi-song-props.h \
brasero-multi-song-props.c \
brasero-rename.h \
brasero-rename.c \
- brasero-notify.c \
- brasero-notify.h \
brasero-video-disc.c \
brasero-video-disc.h \
brasero-video-project.h \
@@ -202,41 +134,26 @@
brasero-video-tree-model.h \
brasero-app.c \
brasero-app.h \
- brasero-session-cfg.h \
- brasero-session-cfg.c \
- brasero-burn-options.h \
- brasero-burn-options.c \
brasero-project-name.c \
brasero-project-name.h \
- brasero-medium-properties.h \
- brasero-medium-properties.c \
- brasero-src-image.h \
- brasero-src-image.c \
- brasero-tool-color-picker.h \
- brasero-tool-color-picker.c \
- burn-debug.c \
- burn-debug.h \
- eggdesktopfile.c \
- eggdesktopfile.h \
- eggsmclient.c \
- eggsmclient.h \
- eggsmclient-private.h \
- eggsmclient-xsmp.c \
brasero-project-parse.c \
- brasero-project-parse.h
+ brasero-project-parse.h \
+ brasero-xsession.c \
+ brasero-xsession.h
if BUILD_INOTIFY
brasero_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
endif
-brasero_LDADD = \
+brasero_LDADD = \
../libbrasero-media/libbrasero-media.la \
+ ../libbrasero-burn/libbrasero-burn.la \
+ ../libbrasero-utils/libbrasero-utils.la \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GIO_LIBS) \
$(BRASERO_GCONF_LIBS) \
$(BRASERO_GSTREAMER_LIBS) \
$(BRASERO_GSTREAMER_BASE_LIBS) \
- $(BRASERO_SM_LIBS) \
$(BRASERO_GTK_LIBS) \
$(BRASERO_GMODULE_LIBS) \
$(BRASERO_DBUS_LIBS) \
Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c (original)
+++ trunk/src/brasero-app.c Thu Mar 19 20:22:59 2009
@@ -32,22 +32,31 @@
#include <libxml/parser.h>
#include <libxml/xmlstring.h>
+#include "brasero-misc.h"
+
#include "brasero-app.h"
-#include "brasero-utils.h"
-#include "brasero-jacket-edit.h"
#include "brasero-blank-dialog.h"
#include "brasero-sum-dialog.h"
#include "brasero-eject-dialog.h"
-#include "brasero-session.h"
#include "brasero-project-manager.h"
+#include "brasero-xsession.h"
#include "brasero-pref.h"
+
+#include "brasero-drive.h"
+
+#include "burn-caps.h"
+#include "burn-debug.h"
+
+#include "brasero-tags.h"
+#include "brasero-burn.h"
+#include "brasero-session.h"
+#include "brasero-burn-lib.h"
+
#include "brasero-image-option-dialog.h"
#include "brasero-disc-copy-dialog.h"
#include "brasero-burn-dialog.h"
-#include "burn-debug.h"
-#include "brasero-drive.h"
-#include "burn-caps.h"
-#include "burn.h"
+#include "brasero-jacket-edit.h"
+
#include "burn-plugin-manager.h"
typedef struct _BraseroAppPrivate BraseroAppPrivate;
Modified: trunk/src/brasero-app.h
==============================================================================
--- trunk/src/brasero-app.h (original)
+++ trunk/src/brasero-app.h Thu Mar 19 20:22:59 2009
@@ -23,8 +23,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "burn-session.h"
-
+#include "brasero-session.h"
G_BEGIN_DECLS
Modified: trunk/src/brasero-blank-dialog.c
==============================================================================
--- trunk/src/brasero-blank-dialog.c (original)
+++ trunk/src/brasero-blank-dialog.c Thu Mar 19 20:22:59 2009
@@ -33,11 +33,15 @@
#include <gtk/gtk.h>
+#include "brasero-misc.h"
+
#include "burn-basics.h"
-#include "burn-session.h"
-#include "burn.h"
+#include "burn-caps.h"
+
+#include "brasero-session.h"
+#include "brasero-burn.h"
+
#include "burn-plugin-manager.h"
-#include "brasero-utils.h"
#include "brasero-tool-dialog.h"
#include "brasero-blank-dialog.h"
Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c (original)
+++ trunk/src/brasero-data-disc.c Thu Mar 19 20:22:59 2009
@@ -33,6 +33,8 @@
#include <gtk/gtk.h>
+#include "brasero-misc.h"
+
#include "eggtreemultidnd.h"
#include "baobab-cell-renderer-progress.h"
@@ -55,8 +57,10 @@
#include "burn-debug.h"
#include "burn-basics.h"
-#include "burn-track.h"
-#include "burn-session.h"
+
+#include "brasero-track.h"
+#include "brasero-session.h"
+
#include "brasero-volume.h"
Modified: trunk/src/brasero-data-project.h
==============================================================================
--- trunk/src/brasero-data-project.h (original)
+++ trunk/src/brasero-data-project.h Thu Mar 19 20:22:59 2009
@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#include "brasero-file-node.h"
-#include "burn-session.h"
+#include "brasero-session.h"
#ifdef BUILD_INOTIFY
#include "brasero-file-monitor.h"
Modified: trunk/src/brasero-data-tree-model.c
==============================================================================
--- trunk/src/brasero-data-tree-model.c (original)
+++ trunk/src/brasero-data-tree-model.c Thu Mar 19 20:22:59 2009
@@ -31,6 +31,8 @@
#include "burn-basics.h"
+#include "brasero-misc.h"
+
#include "brasero-data-tree-model.h"
#include "brasero-data-project.h"
#include "brasero-data-vfs.h"
Modified: trunk/src/brasero-disc.c
==============================================================================
--- trunk/src/brasero-disc.c (original)
+++ trunk/src/brasero-disc.c Thu Mar 19 20:22:59 2009
@@ -36,7 +36,7 @@
#include "brasero-marshal.h"
#include "brasero-disc.h"
-#include "burn-session.h"
+#include "brasero-session.h"
static void brasero_disc_base_init (gpointer g_class);
Modified: trunk/src/brasero-disc.h
==============================================================================
--- trunk/src/brasero-disc.h (original)
+++ trunk/src/brasero-disc.h Thu Mar 19 20:22:59 2009
@@ -34,7 +34,7 @@
#include "brasero-project-parse.h"
#include "burn-basics.h"
-#include "burn-session.h"
+#include "brasero-session.h"
G_BEGIN_DECLS
Modified: trunk/src/brasero-eject-dialog.c
==============================================================================
--- trunk/src/brasero-eject-dialog.c (original)
+++ trunk/src/brasero-eject-dialog.c Thu Mar 19 20:22:59 2009
@@ -41,7 +41,7 @@
#include "brasero-volume.h"
#include "burn-debug.h"
#include "brasero-utils.h"
-#include "burn.h"
+#include "brasero-burn.h"
G_DEFINE_TYPE (BraseroEjectDialog, brasero_eject_dialog, BRASERO_TYPE_TOOL_DIALOG);
Modified: trunk/src/brasero-file-monitor.c
==============================================================================
--- trunk/src/brasero-file-monitor.c (original)
+++ trunk/src/brasero-file-monitor.c Thu Mar 19 20:22:59 2009
@@ -622,6 +622,7 @@
BraseroInotifyFileData *data;
gchar *parent;
GSList *list;
+ GFile *file;
guint32 wd;
priv = BRASERO_FILE_MONITOR_PRIVATE (self);
@@ -641,7 +642,9 @@
/* Since we monitor the parent, put that into a special table */
data = g_new0 (BraseroInotifyFileData, 1);
data->callback_data = callback_data;
- BRASERO_GET_BASENAME_FOR_DISPLAY (uri, data->name);
+ file = g_file_new_for_uri (uri);
+ data->name = g_file_get_basename (file);
+ g_object_unref (file);
/* inotify always return the same wd for the same file */
list = g_hash_table_lookup (priv->files, GINT_TO_POINTER (wd));
Modified: trunk/src/brasero-filter-option.c
==============================================================================
--- trunk/src/brasero-filter-option.c (original)
+++ trunk/src/brasero-filter-option.c Thu Mar 19 20:22:59 2009
@@ -32,10 +32,11 @@
#include <gconf/gconf-client.h>
+#include "brasero-misc.h"
+
#include "brasero-filter-option.h"
#include "brasero-data-project.h"
#include "brasero-data-vfs.h"
-#include "brasero-utils.h"
typedef struct _BraseroFilterOptionPrivate BraseroFilterOptionPrivate;
struct _BraseroFilterOptionPrivate
Modified: trunk/src/brasero-multi-song-props.c
==============================================================================
--- trunk/src/brasero-multi-song-props.c (original)
+++ trunk/src/brasero-multi-song-props.c Thu Mar 19 20:22:59 2009
@@ -31,9 +31,10 @@
#include <gst/gst.h>
+#include "brasero-misc.h"
+
#include "brasero-multi-song-props.h"
#include "brasero-rename.h"
-#include "brasero-utils.h"
typedef struct _BraseroMultiSongPropsPrivate BraseroMultiSongPropsPrivate;
struct _BraseroMultiSongPropsPrivate
Modified: trunk/src/brasero-plugin-manager-ui.c
==============================================================================
--- trunk/src/brasero-plugin-manager-ui.c (original)
+++ trunk/src/brasero-plugin-manager-ui.c Thu Mar 19 20:22:59 2009
@@ -35,8 +35,10 @@
#include <gconf/gconf-client.h>
+#include "brasero-misc.h"
+
#include "brasero-plugin-manager-ui.h"
-#include "brasero-utils.h"
+
#include "burn-plugin.h"
#include "burn-caps.h"
#include "burn-plugin-private.h"
Modified: trunk/src/brasero-project-manager.c
==============================================================================
--- trunk/src/brasero-project-manager.c (original)
+++ trunk/src/brasero-project-manager.c Thu Mar 19 20:22:59 2009
@@ -215,14 +215,13 @@
GtkWidget *toplevel;
GtkWidget *dialog;
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (manager));
- dialog = NULL;
+ if (manager->priv->type == BRASERO_PROJECT_TYPE_AUDIO) {
+ brasero_project_create_audio_cover (BRASERO_PROJECT (manager->priv->project), edit);
+ return;
+ }
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (manager));
dialog = brasero_jacket_edit_dialog_new (toplevel, &edit);
-
- if (manager->priv->type == BRASERO_PROJECT_TYPE_AUDIO)
- brasero_project_set_cover_specifics (BRASERO_PROJECT (manager->priv->project), edit);
-
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
Modified: trunk/src/brasero-project-parse.h
==============================================================================
--- trunk/src/brasero-project-parse.h (original)
+++ trunk/src/brasero-project-parse.h Thu Mar 19 20:22:59 2009
@@ -29,7 +29,7 @@
#include <glib.h>
-#include "burn-track.h"
+#include "brasero-track.h"
G_BEGIN_DECLS
Modified: trunk/src/brasero-project-type-chooser.c
==============================================================================
--- trunk/src/brasero-project-type-chooser.c (original)
+++ trunk/src/brasero-project-type-chooser.c Thu Mar 19 20:22:59 2009
@@ -36,10 +36,11 @@
#include <gtk/gtk.h>
-#include "brasero-project-type-chooser.h"
+#include "brasero-app.h"
#include "brasero-utils.h"
#include "brasero-session.h"
+#include "brasero-project-type-chooser.h"
G_DEFINE_TYPE (BraseroProjectTypeChooser, brasero_project_type_chooser, GTK_TYPE_EVENT_BOX);
Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c (original)
+++ trunk/src/brasero-project.c Thu Mar 19 20:22:59 2009
@@ -52,24 +52,28 @@
#include <totem-pl-parser.h>
#endif
+#include "brasero-misc.h"
+#include "brasero-jacket-edit.h"
+
#include "burn-debug.h"
-#include "burn-session.h"
+#include "brasero-tags.h"
+#include "brasero-session.h"
#ifdef BUILD_PREVIEW
#include "brasero-player.h"
#endif
-#include "brasero-app.h"
-#include "brasero-project.h"
#include "brasero-session-cfg.h"
-#include "brasero-jacket-edit.h"
+#include "brasero-cover.h"
+
#include "brasero-project-type-chooser.h"
+#include "brasero-app.h"
+#include "brasero-project.h"
#include "brasero-disc.h"
#include "brasero-data-disc.h"
#include "brasero-audio-disc.h"
#include "brasero-video-disc.h"
#include "brasero-disc-option-dialog.h"
-#include "brasero-utils.h"
#include "brasero-uri-container.h"
#include "brasero-layout-object.h"
#include "brasero-disc-message.h"
@@ -876,26 +880,6 @@
return brasero_disc_get_status (disc, NULL, NULL);
}
-/******************************** cover ****************************************/
-void
-brasero_project_set_cover_specifics (BraseroProject *self,
- BraseroJacketEdit *cover)
-{
- BraseroBurnSession *session;
-
- if (!BRASERO_IS_AUDIO_DISC (self->priv->current))
- return;
-
- session = BRASERO_BURN_SESSION (brasero_session_cfg_new ());
- brasero_disc_set_session_param (BRASERO_DISC (self->priv->current), session);
- brasero_disc_set_session_contents (BRASERO_DISC (self->priv->current), session);
- brasero_jacket_edit_set_audio_tracks (BRASERO_JACKET_EDIT (cover),
- gtk_entry_get_text (GTK_ENTRY (self->priv->name_display)),
- self->priv->cover,
- brasero_burn_session_get_tracks (session));
- g_object_unref (session);
-}
-
/******************************** burning **************************************/
static void
brasero_project_no_song_dialog (BraseroProject *project)
@@ -915,6 +899,27 @@
GTK_MESSAGE_WARNING);
}
+static void
+brasero_project_setup_session (BraseroProject *project,
+ BraseroBurnSession *session)
+{
+ const gchar *label;
+
+ label = gtk_entry_get_text (GTK_ENTRY (project->priv->name_display));
+ brasero_burn_session_set_label (session, label);
+
+ if (project->priv->cover) {
+ GValue *value;
+
+ value = g_new0 (GValue, 1);
+ g_value_init (value, G_TYPE_STRING);
+ g_value_set_string (value, project->priv->cover);
+ brasero_burn_session_tag_add (session,
+ BRASERO_COVER_URI,
+ value);
+ }
+}
+
void
brasero_project_burn (BraseroProject *project)
{
@@ -949,20 +954,6 @@
/* setup, show, and run options dialog */
dialog = brasero_disc_option_dialog_new ();
-
- if (!brasero_app_is_running (brasero_app_get_default ())) {
- const gchar *label;
-
- /* Set the label for the session in the burn option dialog but
- * only if we were started to burn a project (like through
- * nautilus). */
- label = gtk_entry_get_text (GTK_ENTRY (project->priv->name_display));
-
- session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
- brasero_burn_session_set_label (session, label);
- g_object_unref (session);
- }
-
brasero_disc_option_dialog_set_disc (BRASERO_DISC_OPTION_DIALOG (dialog),
project->priv->current);
@@ -977,25 +968,7 @@
session = brasero_disc_option_dialog_get_session (BRASERO_DISC_OPTION_DIALOG (dialog));
gtk_widget_destroy (dialog);
- if (brasero_app_is_running (brasero_app_get_default ())) {
- const gchar *label;
-
- /* Set the label for the session but only if we weren't started
- * to burn a project (like through nautilus). */
- label = gtk_entry_get_text (GTK_ENTRY (project->priv->name_display));
- brasero_burn_session_set_label (session, label);
- }
-
- if (project->priv->cover) {
- GValue *value;
-
- value = g_new0 (GValue, 1);
- g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, project->priv->cover);
- brasero_burn_session_tag_add (session,
- BRASERO_COVER_URI,
- value);
- }
+ brasero_project_setup_session (project, session);
/* now setup the burn dialog */
success = brasero_app_burn (brasero_app_get_default (), session);
@@ -1008,6 +981,29 @@
project->priv->is_burning = 0;
}
+/******************************** cover ****************************************/
+void
+brasero_project_create_audio_cover (BraseroProject *project,
+ BraseroJacketEdit *cover)
+{
+ BraseroBurnSession *session;
+ GtkWidget *window;
+
+ if (!BRASERO_IS_AUDIO_DISC (project->priv->current))
+ return;
+
+ session = BRASERO_BURN_SESSION (brasero_session_cfg_new ());
+ brasero_disc_set_session_param (BRASERO_DISC (project->priv->current), session);
+ brasero_disc_set_session_contents (BRASERO_DISC (project->priv->current), session);
+ brasero_project_setup_session (project, session);
+
+ window = brasero_session_edit_cover (session, gtk_widget_get_toplevel (GTK_WIDGET (project)));
+ g_object_unref (session);
+
+ gtk_dialog_run (GTK_DIALOG (window));
+ gtk_widget_destroy (window);
+}
+
/******************************** ******************************************/
static void
brasero_project_switch (BraseroProject *project, BraseroProjectType type)
Modified: trunk/src/brasero-project.h
==============================================================================
--- trunk/src/brasero-project.h (original)
+++ trunk/src/brasero-project.h Thu Mar 19 20:22:59 2009
@@ -104,7 +104,7 @@
GtkUIManager *manager);
void
-brasero_project_set_cover_specifics (BraseroProject *project,
- BraseroJacketEdit *cover);
+brasero_project_create_audio_cover (BraseroProject *project,
+ BraseroJacketEdit *cover);
#endif /* PROJECT_H */
Modified: trunk/src/brasero-search-beagle.c
==============================================================================
--- trunk/src/brasero-search-beagle.c (original)
+++ trunk/src/brasero-search-beagle.c Thu Mar 19 20:22:59 2009
@@ -44,6 +44,8 @@
#include <beagle/beagle.h>
+#include "brasero-misc.h"
+
#include "brasero-app.h"
#include "brasero-utils.h"
#include "brasero-search-entry.h"
Modified: trunk/src/brasero-song-properties.c
==============================================================================
--- trunk/src/brasero-song-properties.c (original)
+++ trunk/src/brasero-song-properties.c Thu Mar 19 20:22:59 2009
@@ -38,8 +38,10 @@
#include "brasero-song-properties.h"
#include "brasero-time-button.h"
-#include "brasero-utils.h"
-#include "burn-track.h"
+
+#include "brasero-misc.h"
+
+#include "brasero-track.h"
G_DEFINE_TYPE (BraseroSongProps, brasero_song_props, GTK_TYPE_DIALOG);
Modified: trunk/src/brasero-split-dialog.c
==============================================================================
--- trunk/src/brasero-split-dialog.c (original)
+++ trunk/src/brasero-split-dialog.c Thu Mar 19 20:22:59 2009
@@ -33,7 +33,10 @@
#include "brasero-player.h"
#include "brasero-utils.h"
#include "brasero-metadata.h"
-#include "burn-track.h"
+
+#include "brasero-misc.h"
+
+#include "brasero-track.h"
enum {
START_COL,
Modified: trunk/src/brasero-sum-dialog.c
==============================================================================
--- trunk/src/brasero-sum-dialog.c (original)
+++ trunk/src/brasero-sum-dialog.c Thu Mar 19 20:22:59 2009
@@ -42,14 +42,18 @@
#include "brasero-sum-dialog.h"
#include "brasero-tool-dialog.h"
+#include "brasero-xfer.h"
+
+#include "brasero-misc.h"
+
#include "brasero-drive.h"
#include "brasero-medium.h"
#include "brasero-volume.h"
-#include "brasero-xfer.h"
+
#include "burn-basics.h"
#include "burn-debug.h"
-#include "burn.h"
-#include "brasero-utils.h"
+
+#include "brasero-burn.h"
G_DEFINE_TYPE (BraseroSumDialog, brasero_sum_dialog, BRASERO_TYPE_TOOL_DIALOG);
Modified: trunk/src/brasero-tool-dialog.c
==============================================================================
--- trunk/src/brasero-tool-dialog.c (original)
+++ trunk/src/brasero-tool-dialog.c Thu Mar 19 20:22:59 2009
@@ -33,12 +33,15 @@
#include <gtk/gtk.h>
-#include "brasero-utils.h"
#include "brasero-progress.h"
#include "brasero-medium-selection.h"
#include "brasero-tool-dialog.h"
-#include "burn-session.h"
-#include "burn.h"
+
+#include "brasero-misc.h"
+
+#include "brasero-session.h"
+#include "brasero-burn.h"
+
#include "brasero-medium.h"
#include "brasero-drive.h"
Modified: trunk/src/brasero-tool-dialog.h
==============================================================================
--- trunk/src/brasero-tool-dialog.h (original)
+++ trunk/src/brasero-tool-dialog.h Thu Mar 19 20:22:59 2009
@@ -33,10 +33,11 @@
#include <gtk/gtk.h>
#include "burn-basics.h"
-#include "burn-job.h"
-#include "burn.h"
+
+#include "brasero-session.h"
+#include "brasero-burn.h"
+
#include "brasero-medium.h"
-#include "burn-session.h"
#include "brasero-medium-monitor.h"
G_BEGIN_DECLS
Modified: trunk/src/brasero-video-project.h
==============================================================================
--- trunk/src/brasero-video-project.h (original)
+++ trunk/src/brasero-video-project.h Thu Mar 19 20:22:59 2009
@@ -27,15 +27,16 @@
#include <glib-object.h>
#include <gdk/gdk.h>
+#include "brasero-track.h"
+
+#include "brasero-disc.h"
+
#ifdef BUILD_INOTIFY
#include "brasero-file-monitor.h"
#endif
-#include "burn-track.h"
-#include "brasero-disc.h"
-
G_BEGIN_DECLS
#define BRASERO_TYPE_VIDEO_PROJECT (brasero_video_project_get_type ())
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Thu Mar 19 20:22:59 2009
@@ -45,11 +45,13 @@
#include "brasero-project-manager.h"
#include "brasero-multi-dnd.h"
-#include "brasero-session.h"
#include "brasero-utils.h"
#include "brasero-app.h"
+
#include "burn-debug.h"
-#include "burn.h"
+
+#include "brasero-burn-lib.h"
+#include "brasero-session.h"
#include "eggsmclient.h"
@@ -534,7 +536,7 @@
NULL);
brasero_burn_set_debug (debug);
- brasero_burn_library_init ();
+ brasero_burn_library_start ();
brasero_enable_multi_DND ();
brasero_utils_init ();
@@ -546,7 +548,7 @@
brasero_app_parse_options (current_app);
current_app = NULL;
- brasero_burn_library_shutdown ();
+ brasero_burn_library_stop ();
gconf_client_remove_dir (client, BRASERO_CONF_DIR, NULL);
g_object_unref (client);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
