smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-27 07:28:17 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Fix bug with master's color

Browse source 
[Reviewed] GZharun
This commit is contained in:
nikolay 2014-08-21 12:15:00 +03:00
parent 3d185858ff
commit 1ed4ea684b
6 changed files with 133 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/route_ui.cc
View file

@ -196,8 +196,13 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
color = MixerStrip::palette_random_color();
}
else
color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]);
{
if( _route->is_master() )
color = (Gdk::Color)(MixerStrip::XMLColor[master_color]);
else
color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]);
}
set_color (color);
}

6
gtk2_ardour/ui/add_tracks_dialog.xml
View file

@ -62,15 +62,15 @@
text="CANCEL"
x="0"
y="155"
width="70"
width="69"
height="25"/>
<Button style="generic_button"
id="ok_button"
text="OK"
x="71"
x="70"
y="155"
width="70"
width="69"
height="25"/>
</Layout>
</Dialog>

4
gtk2_ardour/ui/editor_window.xml
View file

@ -54,7 +54,7 @@
handlesource="dsp_load_fader_handle.png"
minposx="0"
minposy="3"
maxposx="78"
maxposx="56"
maxposy="3"
readonly="true"
x="28"
@ -79,7 +79,7 @@
handlesource="dsp_load_fader_handle.png"
minposx="0"
minposy="3"
maxposx="78"
maxposx="56"
maxposy="3"
readonly="true"
x="28"

18
gtk2_ardour/windows/tracks.vcxproj
View file

@ -777,13 +777,31 @@
<None Include="..\icons\export_icons.sh" />
</ItemGroup>
<ItemGroup>
<Xml Include="..\ui\add_tracks_dialog.xml" />
<Xml Include="..\ui\audio_time_axis.xml" />
<Xml Include="..\ui\automation_time_axis.xml" />
<Xml Include="..\ui\compact_meter_bridge.xml" />
<Xml Include="..\ui\compact_meter_strip.xml" />
<Xml Include="..\ui\device_capture_control.xml" />
<Xml Include="..\ui\device_playback_control.xml" />
<Xml Include="..\ui\editor_mixer.xml" />
<Xml Include="..\ui\editor_window.xml" />
<Xml Include="..\ui\inspector_gain_meter.xml" />
<Xml Include="..\ui\master_ui.xml" />
<Xml Include="..\ui\master_ui_gain_meter.xml" />
<Xml Include="..\ui\meter_bridge_view.xml" />
<Xml Include="..\ui\meter_strip.xml" />
<Xml Include="..\ui\meter_strip_gain_meter.xml" />
<Xml Include="..\ui\midi_device_control.xml" />
<Xml Include="..\ui\mixer_bridge_view.xml" />
<Xml Include="..\ui\mixer_gain_meter.xml" />
<Xml Include="..\ui\mixer_strip.xml" />
<Xml Include="..\ui\session_close_dialog.xml" />
<Xml Include="..\ui\session_dialog.xml" />
<Xml Include="..\ui\session_lock_dialog.xml" />
<Xml Include="..\ui\time_info_box.xml" />
<Xml Include="..\ui\tracks_preferences.xml" />
<Xml Include="..\ui\track_header_gain_meter.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

54
gtk2_ardour/windows/tracks.vcxproj.filters
View file

@ -2168,5 +2168,59 @@
<Xml Include="..\ui\session_lock_dialog.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\add_tracks_dialog.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\audio_time_axis.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\automation_time_axis.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\compact_meter_bridge.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\compact_meter_strip.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\editor_mixer.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\inspector_gain_meter.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\master_ui.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\master_ui_gain_meter.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\meter_bridge_view.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\meter_strip.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\meter_strip_gain_meter.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\mixer_bridge_view.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\mixer_gain_meter.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\mixer_strip.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\session_close_dialog.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\time_info_box.xml">
<Filter>ui</Filter>
</Xml>
<Xml Include="..\ui\track_header_gain_meter.xml">
<Filter>ui</Filter>
</Xml>
</ItemGroup>
</Project>

51
libs/ardour/session_state.cc
View file

@ -49,6 +49,10 @@
#include <sys/statvfs.h>
#endif
#ifdef _WIN32
#include <windows.h>
#endif
#include <glib.h>
#include <glib/gstdio.h>
@ -2108,6 +2112,30 @@ Session::refresh_disk_space ()
}
}
#endif
#ifdef _WIN32
BOOL fResult;
const char *pszDrive = NULL;
DWORD dwSectPerClust,
dwBytesPerSect,
dwFreeClusters,
dwTotalClusters;
if( session_dirs.empty() )
return;
pszDrive = session_dirs.begin()->path.c_str();
fResult = GetDiskFreeSpace (pszDrive,
&dwSectPerClust,
&dwBytesPerSect,
&dwFreeClusters,
&dwTotalClusters);
if( 0 != fResult )
{
float number_of_4K_blocks_in_cluster = dwSectPerClust*dwBytesPerSect/4096.0;
_total_free_4k_blocks = floor (dwFreeClusters * number_of_4K_blocks_in_cluster);
}
return;
#endif
}
float
@ -2120,9 +2148,28 @@ Session::get_disk_usage_percentage ()
statfs (i->path.c_str(), &statfsbuf);
return 100 - (statfsbuf.f_bfree * 100.0)/(statfsbuf.f_blocks);
#else
return -1;
#endif
#ifdef _WIN32
BOOL fResult;
const char *pszDrive = NULL;
DWORD dwSectPerClust,
dwBytesPerSect,
dwFreeClusters,
dwTotalClusters;
pszDrive = session_dirs.begin()->path.c_str();
fResult = GetDiskFreeSpace (pszDrive,
&dwSectPerClust,
&dwBytesPerSect,
&dwFreeClusters,
&dwTotalClusters);
return 100 - (dwFreeClusters*100.0)/dwTotalClusters;
#endif
return -1;
}
string