13
0
Commit Graph

673 Commits

Author SHA1 Message Date
3aee160b19 provide PBD::demangle() even on platforms without HAVE_EXECINFO 2013-10-04 12:22:00 -04:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
8ddd12a60d Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
060c56cc3f Minor tweaks to MSVC build (hopefully of little consequence) 2013-08-26 17:50:17 +01:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
04bf9d1e95 fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils
threads created with this code can now just return a value as they normally would, and the
infrastructure will ensure cleanup. there is no longer any reason to call pthread_exit_pbd()
and so that has been removed.
2013-08-15 11:44:47 -04:00
e6521bb043 Merge branch 'master' into cairocanvas 2013-08-14 13:11:34 -04:00
63745512bc Call setup_libpbd_enums in PBD::init for portability 2013-08-13 20:15:47 +10:00
1db894f886 Call Gio::init from PBD::init instead of ARDOUR::init
PBD needs Gio for PBD::copy_file and perhaps others
2013-08-13 20:15:47 +10:00
29193c76cc Add PBD::init and PBD::cleanup
A bit of refactoring to move initialization of libpbd into libpbd
rather than rely on "client" code(ui,libardour,tests etc) to do it
2013-08-13 20:15:47 +10:00
Michael Fisher
71e2fbbcff Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
2013-08-08 15:26:19 -04:00
Michael Fisher
9afb71eb5a Stop compiler warning about NSURL 2013-08-08 15:26:18 -04:00
Michael Fisher
bfbc55a673 Proper OSX/CLANG/CXX11 support in stl_delete.h
- replaces fix in 066df0d218
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++
2013-08-08 15:26:17 -04:00
59a3b797d7 fix compiler warnings. 2013-08-08 15:26:16 -04:00
Michael R. Fisher
ea08feec48 Temporary OSX/Clang/C++11 workaround
- Adds a directive that includes <vector> upon specific conditions
- WIP
2013-08-08 15:23:10 -04:00
daad42dd6c Revert "Remove non-portable and unnused header includes"
This reverts commit 7ef79d3f4b.
2013-08-08 15:23:08 -04:00
cebd189239 Remove non-portable and unnused header includes 2013-08-08 15:23:08 -04:00
8c28b3ad07 add new files from test changes by timbyr 2013-08-08 15:23:08 -04:00
20311ed2f3 Use test_search_path to find test data in xpath test 2013-08-08 15:23:08 -04:00
cdaa32d2c6 Add test_search_path function in PBD testsuite 2013-08-08 15:23:08 -04:00
490311bc08 'libs/ardour' - Main body of changes required for building with MSVC 2013-08-04 15:36:07 +01:00
fa59391f6a 'libs/ardour' - Use 'const_iterator' where appropriate (required to be buildable with MSVC) 2013-08-04 15:06:10 +01:00
aaabaf5d3c Merge branch 'master' into windows 2013-08-02 12:51:24 -04:00
Michael Fisher
71c26e2820 Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
2013-08-02 12:01:47 -04:00
Michael Fisher
d882b03f7d Stop compiler warning about NSURL 2013-08-02 08:59:32 -05:00
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
98c6ca5abc Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-07-31 15:09:50 +01:00
Michael Fisher
a8456b3766 Proper OSX/CLANG/CXX11 support in stl_delete.h
- replaces fix in 066df0d218
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++
2013-07-29 14:43:11 -05:00
cd28d62b26 fix compiler warnings. 2013-07-28 20:32:52 +02:00
338f53e69a Further changes to msvc/pbd (mostly to add support for getopt and getopt_long) 2013-07-24 17:46:25 +01:00
7f882b5a92 Correct a typo in 'msvc_pbd.h' 2013-07-24 10:22:16 +01:00
b02fb1dbea Reinstate include of regex.h for Linux and MinGW build
I'm not sure how boost/regex.h is relevant but it doesn't enable the
build to succeed in on Linux or using Mingw so if this is not an error
and required for msvc build then fix it
2013-07-22 13:42:05 +10:00
9d774969fc Adapt libs/pbd/ffs.cc to be buildable with MSVC 2013-07-18 12:08:34 +01:00
57e53d577b break symbol name cycle on non-win32-non-gcc platforms 2013-07-17 13:50:04 -04:00
5f15bc9f9f Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-07-17 18:15:51 +01:00
110972e59a JOHNE source files (needed for building libpbd with MSVC) 2013-07-17 14:53:17 +01:00
650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
5f2fcb2e32 Add PBD::ffs function 2013-07-17 19:29:34 +10:00
11335e4bf0 Allow PBD::canonical_path to compile with mingw build 2013-07-17 19:07:23 +10:00
57f9a4c344 Merge branch 'windows' of git://git.ardour.org/ardour/ardour into windows 2013-07-17 08:24:36 +01:00
350ed31655 Remaining changes needed for building libpdb on Windows (except for adding the extra JE source modules) 2013-07-17 08:08:46 +01:00
105652ad09 Accommodate 'pthread-win32' and 'boost/regex' (for libpbd) 2013-07-17 08:06:26 +01:00
c7306f5732 Other (Windows specific) includes for libpbd 2013-07-17 07:38:20 +01:00
e257b79ecd 'libs/pbd/file_utils.cc' didn't apply cleanly for some reason 2013-07-16 19:13:18 +01:00
7b480eaa27 Windows (compiler specific) includes for libpbd 2013-07-16 18:00:49 +01:00
Michael R. Fisher
066df0d218 Temporary OSX/Clang/C++11 workaround
- Adds a directive that includes <vector> upon specific conditions
- WIP
2013-07-15 22:57:35 -05:00
15be154515 use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files 2013-07-15 14:29:00 -04:00
00ae5492f4 (reapply with fixes) Build system changes to support mingw build target 2013-07-15 13:43:17 -04:00
96ea407d1a Revert "Build system changes to support mingw build target"
This reverts commit 94145732f3.
2013-07-15 13:21:22 -04:00
94145732f3 Build system changes to support mingw build target 2013-07-15 13:16:09 -04:00
020ca43ed0 add and Update mutex test that is no longer necessary now that glib has been fixed 2013-07-15 12:53:16 -04:00
f08d9591e6 Fix reading and writing of files on windows in PBD::FileManager 2013-07-15 07:55:36 -04:00
5131b8300f Use g_open instead of ::open in PBD::FileManager
g_open is a macro that evaluates to ::open on linux(and mac) so this
is only a change for windows.
2013-07-15 07:54:29 -04:00
e8ecd32732 Add test for Glib::Mutex::trylock
Behaviour of this method is different on WIN32
2013-07-13 17:00:18 -04:00
ccdc6fcd6a Add DEBUG_TRACE output to file utility functions in libpbd 2013-07-13 16:55:40 -04:00
550eeecc63 Add header include required by mingw compiler 2013-07-13 16:44:59 -04:00
ad89d1e031 Use custom comparator in threadmap for pthread impl with mingw 2013-07-13 08:44:58 -04:00
c43ff1113d Add ::localtime_r implementation for mingw 2013-07-11 15:00:22 -04:00
09e471545b remove direct of realpath(2), replace with canonical_path() which is a no-op on windows 2013-07-11 14:57:16 -04:00
29f178aa4b Add PBD::GlibSemaphore class that uses PBD::atomic_counter etc.
PBD::Semaphore can really be used instead of this class now,
but it didn't exist when I needed this class and it is header only, which
causes some problems because windows.h is included
2013-07-11 14:38:53 -04:00
57f3ba6a1f Add wrapping class for glib atomic counter 2013-07-11 14:37:27 -04:00
2218a70d37 Add timersub macro for platforms where it isn't defined 2013-07-11 14:30:38 -04:00
b6afce39a4 Undef SearchPath where needed as it is defined via windows.h
This is pretty annoying, might even be worth renaming the class
2013-07-11 14:27:24 -04:00
4adb2f97cc Use timeout source to process ui requests on windows
Using a timeout source to process ui events/requests is suboptimal
but it works for the moment. Have to use g_source functions as glibmm
functions are not thread safe AFAIK.

Behaviour should be exactly the same on unix.
2013-07-11 12:56:35 -04:00
7626cd68ac Hide UI request mechanism from inheriting classes 2013-07-11 12:52:46 -04:00
5d20b3e24e Ifdef unix specific test for mingw build 2013-07-11 12:47:56 -04:00
cb23bdd547 Don't use parts of signal.h that aren't defined when using mingw 2013-07-11 12:46:52 -04:00
e70db68fac Add implementation for ProcessSemaphore on windows 2013-07-11 12:46:05 -04:00
8b63e005a1 Include io.h on windows for access 2013-07-11 12:44:33 -04:00
daf570ea5d Add an empty implementation of PBD::mountpoint for mingw
PBD::mountpoint is only used to find peakfiles for old sessions, so it might
not be necessary to implement this for windows.
2013-07-11 12:43:55 -04:00
d7b7953705 Use pbd/resource.h in PBD::FileManager 2013-07-11 12:42:53 -04:00
4eff7b4e82 Add pbd/resource.h for portable access to resource limits 2013-07-11 12:41:55 -04:00
38ebf63961 Fallback to gettimeofday for access time in FileManager 2013-07-11 12:39:24 -04:00
acc13d37a7 Use boost::tokenizer in PBD::parse_debug_options for portability 2013-07-11 12:36:16 -04:00
36a55b8674 Use boost::uuid instead of libuuid 2013-07-11 12:30:32 -04:00
b9fa882c56 Use PBD::pthread_name in debug output instead of pthread_self 2013-07-11 12:01:17 -04:00
1fad4714e3 Use PBD::pthread_name in debug output for portability 2013-07-11 11:53:24 -04:00
227cf470ba Use a std::list instead of std::set for the ThreadMap in libpbd
pthread_t can't work with std::set using the pthread lib on windows
as there is no operator< defined for the type
2013-07-11 11:43:43 -04:00
117118e5f0 Use pthread_equals in libpbd for portability 2013-07-11 11:40:59 -04:00
27eecdc88b Use g_setenv and g_getenv for portability 2013-07-11 11:37:25 -04:00
23bec25bf5 Remove non-portable and unnused header includes 2013-07-11 11:34:37 -04:00
4be2176bd9 Revert "Remove non-portable and unnused header includes"
This reverts commit 7ef79d3f4b.
2013-07-11 11:23:41 -04:00
7ef79d3f4b Remove non-portable and unnused header includes 2013-07-11 11:19:57 -04:00
d555b43f5b add new files from test changes by timbyr 2013-07-11 11:10:56 -04:00
bceab19201 Use test_search_path to find test data in xpath test 2013-07-11 10:59:30 -04:00
a2f5a8d9c0 Add test_search_path function in PBD testsuite 2013-07-11 10:58:35 -04:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
cc960c4f07 remove executable mode-bit from files 2013-06-16 21:54:08 +02:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
4cb31ef74e Revert all close-on-exec changes from earlier today
with b26cc125 these are no longer needed.
2013-06-07 21:07:41 +02:00
fd5f1ef5f5 fix typo in SndFileDescriptor::open() -- check if file open succeeded. 2013-06-07 20:14:42 +02:00
07c6df00cc fix use of sf_open_fd() instad of sf_open() 2013-06-07 19:33:20 +02:00
31d234b48c Merge branch 'master' into cairocanvas 2013-06-07 13:18:48 -04:00
676a23e031 close audio-file if it cannot be opened 2013-06-07 18:56:48 +02:00
0761902b7e fix issue (creating new sound-files) in 92161b57 2013-06-07 18:09:15 +02:00
92161b57ad mark more filedes as close-on-exec. - here audio+midi files! 2013-06-07 17:43:06 +02:00
df99859ad2 more sockets to close on fork() 2013-06-07 17:12:25 +02:00
addb33bc63 implement OSC /ardour/route/send/gainabs and /ardour/route/send/gainDB 2013-06-06 11:14:31 -04:00
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
eb5096bfc7 use hw.physicalcpu to get a more accurate CPU count on OS X (hw.ncpu includes hyperthreading cpus) 2013-05-08 10:47:23 -04:00
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
ebb1271b6f Merge branch 'license-fix' of https://github.com/adiknoth/ardour 2013-05-01 13:01:37 -04:00
c40accda42 don't print stacktraces to the supplied ostream AND cerr - a remnant from debugging wierd problems with stacktrace() on paul's system 2013-04-30 11:12:52 -04:00
Adrian Knoth
13ad68c73c Drop obsolete dmalloc.cc from libs/pbd.
The file relies on -DDEBUG_MALLOC and references

i   #include "/usr/local/src/dmalloc-4.1.2/return.h"

It is safe to assume that it's dead code.
2013-04-22 20:18:36 +02:00
Adrian Knoth
ef1fb4161a Disable obsolete compilation of libs/pds/dmalloc.cc
The file relies on -DDEBUG_MALLOC and references

  #include "/usr/local/src/dmalloc-4.1.2/return.h"

It is safe to assume that it's dead code.
2013-04-22 20:18:36 +02:00
Adrian Knoth
c72c7e6575 Fix license in fastlog.
Date: Mon, 22 Apr 2013 19:09:04 +0200
From: Laurent de Soras <laurent.de.soras@free.fr>
To: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Subject: Re: License of FastLog

Hi Adrian,

> Several open-source projects like Ardour use the code below which has
> no explicit license.
>
> If you agree (read: reply), we'd like to add the MIT license to this
> file, that is, change the copyright statement to the following text:

Nowadays I license my code under the WTFPL, which should
be compatible with the traditional open source licenses.
So please use this one instead:
<http://www.wtfpl.net/about/>

--
Laurent de Soras                  |               Ohm Force
DSP developer & Software designer |  Digital Audio Software
http://ldesoras.free.fr           | http://www.ohmforce.com
2013-04-22 19:21:16 +02:00
4e84bc3a39 changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master 2013-04-12 21:46:44 -04:00
1cb9779401 remove extra output from PBD::stacktrace 2013-04-10 10:49:27 -04:00
30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -04:00
433e3bda70 fix crash when using track templates caused by a recent change to the filescanner API. if the template contains no plugin states, the scanner would return a null pointer, and we would fail to notice 2013-04-06 11:21:09 -04:00
55a1048094 Merge branch 'patches' of https://github.com/jdekozak/ardour 2013-04-05 11:54:34 -04:00
7db5d68cdb adjust demangling code a bit so that it can easily be used with typenames and not just functions in stacktraces 2013-04-05 11:26:39 -04:00
661a9d37e7 fix compilation on OS X 2013-04-01 09:03:33 -04:00
Julien de Kozak
27d77b8719 Fix some compilation warnings 2013-03-30 18:09:40 +01:00
Sakari Bergen
b6c2dec8fa Fix static initialization order problem 2013-03-24 21:18:20 +02:00
Sakari Bergen
24816de6ca Fix PBD wscript to be python3 compatible 2013-03-24 14:51:57 +02:00
027f0e156a Merge branch 'patches' of https://github.com/jdekozak/ardour 2013-03-20 17:47:47 -04:00
a5d3f2d578 make PBD::stacktrace() be clear if it cannot generate stacktraces for some (runtime) reason. not sure why this is an issue, but it is, right now, on my machine 2013-03-20 17:20:13 -04:00
16ce39c230 initial, prototype modifications to permit compilation of local libraries as static libs. required a "fix" to libs/pbd/debug.cc to even get the program up and running, and still does not work due to issues with boost::shared_ptr::enable_shared_from_this. controlled by configure-time --internal-{static,shared}-libs, set to shared by default (as has been the case for years) 2013-03-20 17:18:55 -04:00
Julien de Kozak
1e6d12be03 Fix guard name 2013-03-20 20:17:56 +01:00
a1a8794dad add missing files 2013-03-20 08:43:19 -04:00
a2d6577210 move path_expand() and search_path_expand() into libpbd, and use them to expand search paths given to pathscanner objects (always) 2013-03-20 07:43:19 -04:00
Adrian Knoth
1e32454b36 [cosmetics] Fix typo in debug output
Found by Debian's automatic QA tool.
2013-03-19 17:24:34 +01:00
b0fa3896f5 remove cruft (old cvsignore files) 2013-03-17 23:08:27 +01:00
da41e5087b NOOP - pre videotimline cleanup 2013-03-13 20:28:14 +01:00
e701adea41 add code to display announcements, and parameterize several URL's used in the program
git-svn-id: svn://localhost/ardour2/branches/3.0@14197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 13:44:22 +00:00
77c578f21c minor header fix for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14032 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-30 12:32:53 +00:00
db3da02446 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:51:39 +00:00
58a027b7a2 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13857 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:15:38 +00:00
bb3690db58 merge Marcel Bonnet's patches for Free-BSD
(may need further cleanup:
 compare with timbyr's windows patch,
 verify fst/vsti + ALSA)

git-svn-id: svn://localhost/ardour2/branches/3.0@13774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 17:36:52 +00:00
b924ba9ceb some explanatory text for CrossThreadPool, so that it is possible (maybe) to understand its purpose without divine intervention
git-svn-id: svn://localhost/ardour2/branches/3.0@13671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-16 17:04:48 +00:00
aa13dec8f5 fix complaints from OS X gcc about constness
git-svn-id: svn://localhost/ardour2/branches/3.0@13359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-29 16:13:33 +00:00
760ccbabfb add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
ff2fac11a0 more vst parameter related stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@13119 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-09 16:55:56 +00:00
5bfa705ff7 new file containing very clever code for floating point "equality" comparisons
git-svn-id: svn://localhost/ardour2/branches/3.0@13116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-09 15:46:54 +00:00
Sakari Bergen
1573ea991d Add missing #includes to some tests
git-svn-id: svn://localhost/ardour2/branches/3.0@13100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-28 09:08:29 +00:00
3cd8138a41 convert from Glib:: to Glib::Threads for all thread-related API
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 17:48:55 +00:00
1cdf02ae2f remove use of boost::thread/boost::mutex; bump glibmm requirement to 2.30 in order to pick up Glib::Threads::Mutex which can be used statically, use that to replace boost::mutex; add required inclusion of <cerrno> in a couple of places
git-svn-id: svn://localhost/ardour2/branches/3.0@13076 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-24 21:43:05 +00:00
Carl Hetherington
cc9ed077be Patch from johan_mattsson_m to be more graceful if there
is an undo record which references a non-existant
object; this shouldn't happen, of course, but there was
a bug in some early betas which made it occur (#4920).


git-svn-id: svn://localhost/ardour2/branches/3.0@12930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 21:19:21 +00:00
Carl Hetherington
e58e614f20 Fix build.
git-svn-id: svn://localhost/ardour2/branches/3.0@12910 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 12:54:11 +00:00
e85f11618c Remove unused pbd/filesystem.h/cc
git-svn-id: svn://localhost/ardour2/branches/3.0@12906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:54 +00:00
1f440fbfec Remove unused or unnecessary header includes
git-svn-id: svn://localhost/ardour2/branches/3.0@12905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:51 +00:00
c44917aed7 Remove unused PBD:sys::create_directory/ies functions
git-svn-id: svn://localhost/ardour2/branches/3.0@12892 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:22 +00:00
0d785c8ebd Use g_mkdir_with_parents instead of sys::create_directories
git-svn-id: svn://localhost/ardour2/branches/3.0@12891 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:19 +00:00
7a881ef67a Remove PBD::sys::is_directory and use Glib equivalent
git-svn-id: svn://localhost/ardour2/branches/3.0@12887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:11 +00:00
f558a8c917 Remove unused PBD::sys::exists function
git-svn-id: svn://localhost/ardour2/branches/3.0@12884 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:04 +00:00
6d7302a3a4 Remove unused method PBD::sys::path::leaf
git-svn-id: svn://localhost/ardour2/branches/3.0@12880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:08:55 +00:00
7a6e86c9f9 Remove unused method PBD::sys::path::branch_path
git-svn-id: svn://localhost/ardour2/branches/3.0@12877 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:08:49 +00:00
d2637317a3 Remove unused function PBD::sys::rename
git-svn-id: svn://localhost/ardour2/branches/3.0@12876 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:08:46 +00:00