? gtk_ardour/intl/ChangeLog ? gtk_ardour/intl/Makefile ? gtk_ardour/intl/Makefile.in ? gtk_ardour/intl/VERSION ? gtk_ardour/intl/bindtextdom.c ? gtk_ardour/intl/config.charset ? gtk_ardour/intl/dcgettext.c ? gtk_ardour/intl/dcigettext.c ? gtk_ardour/intl/dcngettext.c ? gtk_ardour/intl/dgettext.c ? gtk_ardour/intl/dngettext.c ? gtk_ardour/intl/eval-plural.h ? gtk_ardour/intl/explodename.c ? gtk_ardour/intl/finddomain.c ? gtk_ardour/intl/gettext.c ? gtk_ardour/intl/gettextP.h ? gtk_ardour/intl/gmo.h ? gtk_ardour/intl/hash-string.h ? gtk_ardour/intl/intl-compat.c ? gtk_ardour/intl/l10nflist.c ? gtk_ardour/intl/libgnuintl.h ? gtk_ardour/intl/loadinfo.h ? gtk_ardour/intl/loadmsgcat.c ? gtk_ardour/intl/localcharset.c ? gtk_ardour/intl/locale.alias ? gtk_ardour/intl/localealias.c ? gtk_ardour/intl/localename.c ? gtk_ardour/intl/ngettext.c ? gtk_ardour/intl/os2compat.c ? gtk_ardour/intl/os2compat.h ? gtk_ardour/intl/osdep.c ? gtk_ardour/intl/plural-exp.c ? gtk_ardour/intl/plural-exp.h ? gtk_ardour/intl/plural.c ? gtk_ardour/intl/plural.y ? gtk_ardour/intl/ref-add.sin ? gtk_ardour/intl/ref-del.sin ? gtk_ardour/intl/textdomain.c ? libs/ardour/intl/ChangeLog ? libs/ardour/intl/Makefile ? libs/ardour/intl/Makefile.in ? libs/ardour/intl/VERSION ? libs/ardour/intl/bindtextdom.c ? libs/ardour/intl/config.charset ? libs/ardour/intl/dcgettext.c ? libs/ardour/intl/dcigettext.c ? libs/ardour/intl/dcngettext.c ? libs/ardour/intl/dgettext.c ? libs/ardour/intl/dngettext.c ? libs/ardour/intl/eval-plural.h ? libs/ardour/intl/explodename.c ? libs/ardour/intl/finddomain.c ? libs/ardour/intl/gettext.c ? libs/ardour/intl/gettextP.h ? libs/ardour/intl/gmo.h ? libs/ardour/intl/hash-string.h ? libs/ardour/intl/intl-compat.c ? libs/ardour/intl/l10nflist.c ? libs/ardour/intl/libgnuintl.h ? libs/ardour/intl/loadinfo.h ? libs/ardour/intl/loadmsgcat.c ? libs/ardour/intl/localcharset.c ? libs/ardour/intl/locale.alias ? libs/ardour/intl/localealias.c ? libs/ardour/intl/localename.c ? libs/ardour/intl/ngettext.c ? libs/ardour/intl/os2compat.c ? libs/ardour/intl/os2compat.h ? libs/ardour/intl/osdep.c ? libs/ardour/intl/plural-exp.c ? libs/ardour/intl/plural-exp.h ? libs/ardour/intl/plural.c ? libs/ardour/intl/plural.y ? libs/ardour/intl/ref-add.sin ? libs/ardour/intl/ref-del.sin ? libs/ardour/intl/textdomain.c ? libs/sigc++/.libs/lt-mytest cvs server: Diffing . cvs server: Diffing DOCUMENTATION cvs server: Diffing gtk_ardour Index: gtk_ardour/export_dialog.cc =================================================================== RCS file: /home/las/cvsroot/ardour/ardour/gtk_ardour/export_dialog.cc,v retrieving revision 1.42 diff -u -r1.42 export_dialog.cc --- gtk_ardour/export_dialog.cc 5 Jul 2004 18:25:17 -0000 1.42 +++ gtk_ardour/export_dialog.cc 22 Jul 2004 18:07:16 -0000 @@ -129,7 +129,7 @@ file_entry.focus_out_event.connect (slot (ARDOUR_UI::generic_focus_out_event)); file_entry.set_name ("ExportFileNameEntry"); - + track_selector.set_name ("ExportTrackSelector"); track_selector.set_usize (-1, 130); track_selector.set_column_min_width (0, 100); @@ -651,12 +651,12 @@ } /* If it the filename hasn't been set before, use the - directory above the current session as a default - location for the export. + current session's export directory as a default + location for the export. */ - + if (file_entry.get_text().length() == 0) { - string dir = session->path(); + string dir = session->export_dir(); string::size_type last_slash; if ((last_slash = dir.find_last_of ('/')) != string::npos) { cvs server: Diffing gtk_ardour/intl cvs server: Diffing gtk_ardour/pixmaps cvs server: Diffing gtk_ardour/po cvs server: Diffing ksi_ardour cvs server: Diffing ksi_ardour/po cvs server: Diffing libs cvs server: Diffing libs/ardour Index: libs/ardour/session.cc =================================================================== RCS file: /home/las/cvsroot/ardour/ardour/libs/ardour/session.cc,v retrieving revision 1.203 diff -u -r1.203 session.cc --- libs/ardour/session.cc 21 Jul 2004 03:54:44 -0000 1.203 +++ libs/ardour/session.cc 22 Jul 2004 18:07:17 -0000 @@ -73,6 +73,7 @@ const char* Session::_statefile_suffix = ".ardour"; const char* Session::sound_dir_name = "sounds"; const char* Session::dead_sound_dir_name = "dead_sounds"; +const char* Session::export_dir_name = "export"; int Session::find_session (string str, string& path, string& snapshot, bool& isnew) Index: libs/ardour/session_state.cc =================================================================== RCS file: /home/las/cvsroot/ardour/ardour/libs/ardour/session_state.cc,v retrieving revision 1.96 diff -u -r1.96 session_state.cc --- libs/ardour/session_state.cc 21 Jul 2004 03:54:44 -0000 1.96 +++ libs/ardour/session_state.cc 22 Jul 2004 18:07:18 -0000 @@ -452,6 +452,15 @@ } } + dir = export_dir (); + + if (mkdir (dir.c_str(), 0755) < 0) { + if (errno != EEXIST) { + error << compose(_("Session: cannot create session export dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; + return -1; + } + } + /* check new_session so we don't overwrite an existing one */ @@ -1934,7 +1943,7 @@ res += '/'; return res; } - + string Session::automation_dir () const { @@ -1950,6 +1959,15 @@ path += "templates/"; return path; +} + +string +Session::export_dir () const +{ + string res = _path; + res += export_dir_name; + res += '/'; + return res; } int cvs server: Diffing libs/ardour/ardour Index: libs/ardour/ardour/session.h =================================================================== RCS file: /home/las/cvsroot/ardour/ardour/libs/ardour/ardour/session.h,v retrieving revision 1.142 diff -u -r1.142 session.h --- libs/ardour/ardour/session.h 21 Jul 2004 03:54:44 -0000 1.142 +++ libs/ardour/ardour/session.h 22 Jul 2004 18:07:18 -0000 @@ -240,6 +240,7 @@ string sound_dir () const; string dead_sound_dir () const; string automation_dir () const; + string export_dir () const; static string template_dir (); static void get_template_list (list&); @@ -1409,6 +1410,7 @@ static const char* sound_dir_name; static const char* dead_sound_dir_name; + static const char* export_dir_name; string discover_best_sound_dir (); int ensure_sound_dir (string, string&); cvs server: Diffing libs/ardour/intl cvs server: Diffing libs/ardour/po cvs server: Diffing libs/cassowary cvs server: Diffing libs/cassowary/cassowary cvs server: Diffing libs/gtk-canvas cvs server: Diffing libs/gtk-canvas/gtk-canvas cvs server: Diffing libs/gtkmm cvs server: Diffing libs/gtkmm/gdk-- cvs server: Diffing libs/gtkmm/gdk--/gdk-- cvs server: Diffing libs/gtkmm/src cvs server: Diffing libs/gtkmm/src/build_sources cvs server: Diffing libs/gtkmm/src/gtk-- Index: libs/gtkmm/src/gtk--/menushell.h =================================================================== RCS file: /home/las/cvsroot/ardour/ardour/libs/gtkmm/src/gtk--/menushell.h,v retrieving revision 1.5 diff -u -r1.5 menushell.h --- libs/gtkmm/src/gtk--/menushell.h 17 Jun 2003 16:37:40 -0000 1.5 +++ libs/gtkmm/src/gtk--/menushell.h 22 Jul 2004 18:07:19 -0000 @@ -3,7 +3,7 @@ #ifndef _GTKMM_MENUSHELL_H #define _GTKMM_MENUSHELL_H -/* $Id: menushell.h,v 1.5 2003/06/17 16:37:40 pbd Exp $ */ +/* $Id: menushell.gen_h,v 1.2 2003/02/27 14:56:24 pbd Exp $ */ /* menushell.h * cvs server: Diffing libs/gtkmm/src/gtk--/private cvs server: Diffing libs/gtkmm/src/gtkmmproc cvs server: Diffing libs/gtkmm/win32 cvs server: Diffing libs/gtkmmext cvs server: Diffing libs/gtkmmext/gtkmmext cvs server: Diffing libs/gtkmmext/gtkmmext/private cvs server: Diffing libs/gtkmmext/po cvs server: Diffing libs/midi++ cvs server: Diffing libs/midi++/midi++ cvs server: Diffing libs/pbd cvs server: Diffing libs/pbd/pbd cvs server: Diffing libs/sigc++ cvs server: Diffing libs/sigc++/.libs cvs server: Diffing libs/sigc++/borland cvs server: Diffing libs/sigc++/djgpp cvs server: Diffing libs/sigc++/riscos cvs server: Diffing libs/sigc++/sigc++ cvs server: Diffing libs/sigc++/sigc++/config cvs server: Diffing libs/sigc++/sigc++/macros cvs server: Diffing libs/sigc++/win32 cvs server: Diffing libs/soundtouch cvs server: Diffing libs/soundtouch/soundtouch cvs server: Diffing templates cvs server: Diffing tools cvs server: Diffing tools/bug_tool cvs server: Diffing tools/bug_tool/ClientCookie cvs server: Diffing tools/preset_xml2rdf