ardour/livetrax
13
0
Fork 0
Code

Convert NSD from glade to gtkmm object

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@499 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Doug McLain 2006-05-12 00:30:13 +00:00
parent f0c0ecf3b1
commit a0fd9fa7a0
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk2_ardour/SConscript
View File

@ -45,9 +45,7 @@ gtkardour.Merge ([
libraries['xslt'],
libraries['soundtouch'],
libraries['samplerate'],
libraries['jack'],
libraries['glade2'],
libraries['libglademm']
libraries['jack']
])
if gtkardour['DMALLOC']:
@ -127,8 +125,6 @@ export_range_markers_dialog.cc
gain_automation_time_axis.cc
gain_meter.cc
ghostregion.cc
glade_path.cc
glade_factory.cc
grouped_buttons.cc
gtk-custom-hruler.c
gtk-custom-ruler.c
@ -192,10 +188,9 @@ fft_graph.cc
fft_result.cc
""")
glade_files=glob.glob('glade/*.glade')
pixmap_files=glob.glob('pixmaps/*.xpm')
intl_files = gtkardour_files + glade_files + glob.glob('*.h')
intl_files = gtkardour_files + glob.glob('*.h')
mtest_files=Split("""
mtest.cc
@ -219,7 +214,6 @@ intl_files += extra_sources
gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
gtkardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
gtkardour.Append(CXXFLAGS="-DGLADEPATH=\\\""+final_prefix+"/share/ardour/glade\\\"")
versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"'
@ -262,7 +256,6 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
# data files
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.ppm'))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/glade'), glade_files))
#dist
env.Alias ('tarball', env.Distribute (env['DISTTREE'],
@ -272,7 +265,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
'ardour.menus', 'ardour.bindings', 'ardour.colors',
'editor_xpms'
] +
gtkardour_files + vst_files + glade_files + pixmap_files +
gtkardour_files + vst_files + pixmap_files +
glob.glob('po/*.po') + glob.glob('*.h')))
# generate a prototype full-featured ardour_ui.rc file

2
gtk2_ardour/ardour_ui.h
View File

@ -61,7 +61,6 @@
#include "audio_clock.h"
#include "ardour_dialog.h"
#include "editing.h"
#include "glade_factory.h"
class AudioClock;
class PublicEditor;
@ -529,7 +528,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
bool _will_create_new_session_automatically;
GladeRef m_new_session_dialog_ref;
NewSessionDialog* m_new_session_dialog;
void open_session ();