View Issue Details

IDProjectCategoryView StatusLast Update
0005360ardourbugspublic2016-08-24 15:13
ReporterTheCranston Assigned Topaul  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Summary0005360: Disk remaining status all red zeros
DescriptionOn OSX the disk free is not working due to sys/vfs.h not being found (10.8.2 platform)

Needed to update wscript to account for 'lion' to define IS_OSX

Change to the conditional on session_state.cc to check for IS_OSX and allow the conditional code to build.

Here are the diffs against SVN:


Index: wscript
===================================================================
--- wscript (revision 14127)
+++ wscript (working copy)
@@ -272,7 +272,7 @@
     # a single way to test if we're on OS X
     #
 
- if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
+ if conf.env['build_target'] in ['panther', 'tiger', 'leopard' , 'lion' ]:
         conf.define ('IS_OSX', 1)
         # force tiger or later, to avoid issues on PPC which defaults
         # back to 10.1 if we don't tell it otherwise.




Index: libs/ardour/session_state.cc
===================================================================
--- libs/ardour/session_state.cc (revision 14127)
+++ libs/ardour/session_state.cc (working copy)
@@ -2080,7 +2080,13 @@
 void
 Session::refresh_disk_space ()
 {
-#if HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H
+
+/* OS X is Posix, so we are all good here even without vfs.h */
+/* Check for IS_OSX and HAVE_SYS_VFS_H , set it if its not on */
+/* There's got to be a more elegant way to do this.... Ideas? */
+
+
+#if IS_OSX || (HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H)
     
     Glib::Threads::Mutex::Lock lm (space_lock);
 
@@ -2124,6 +2130,7 @@
         }
     }
 #endif
+
 }
 
 string
Additional InformationI'm sure I've over simplified the fix, but it compiles and functions correctly now. Hope that helps.
TagsNo tags attached.

Activities

paul

2013-03-06 01:05

administrator   ~0014680

variations on these changes committed in rev 14157. thanks!

TheCranston

2016-08-24 15:13

reporter   ~0018470

Thanks for the resolution.

Issue History

Date Modified Username Field Change
2013-03-04 23:49 TheCranston New Issue
2013-03-06 01:05 paul cost => 0.00
2013-03-06 01:05 paul Note Added: 0014680
2013-03-06 01:05 paul Status new => resolved
2013-03-06 01:05 paul Resolution open => fixed
2013-03-06 01:05 paul Assigned To => paul
2016-08-24 15:13 TheCranston Note Added: 0018470
2016-08-24 15:13 TheCranston Status resolved => closed