Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 315 insertions, 0 deletions

diff --git a/lib/timidity/TiMidity.ad.in b/lib/timidity/TiMidity.ad.in
new file mode 100644
index 0000000000..e7fad7fcfa
--- /dev/null
+++ b/lib/timidity/TiMidity.ad.in
@@ -0,0 +1,315 @@
+! TiMidity.ad -- app-defaults file for TiMidity++ XAW interface
+! Created by Yoshishige Arai <ryo2@on.rim.or.jp>
+! Modified by Chisato Yamauchi <cyamauch@hst.phyas.aichi-edu.ac.jp>
+
+TiMidity*international: True
+TiMidity*inputMethod: none
+TiMidity*gradientBar: True
+TiMidity*highlightThickness: 1
+TiMidity*BitmapDir: @pkglibdir@/bitmaps/
+TiMidity*file_simplemenu*international: True
+TiMidity*file_simplemenu.load.label: Load (Meta-N)
+TiMidity*file_simplemenu.saveconfig.label: Save Config (Meta-S)
+TiMidity*file_simplemenu.hidetext.label: (Un)Hide Messages (Ctrl-M)
+TiMidity*file_simplemenu.hidetrace.label: (Un)Hide Trace (Ctrl-T)
+TiMidity*file_simplemenu.shuffle.label: Shuffle (Ctrl-S)
+TiMidity*file_simplemenu.repeat.label: Repeat (Ctrl-R)
+TiMidity*file_simplemenu.autostart.label: Auto Start
+TiMidity*file_simplemenu.autoquit.label: Auto Exit
+TiMidity*file_simplemenu.filelist.label: File List (Ctrl-F)
+TiMidity*file_simplemenu.modes.label: Extend Modes (Ctrl-O)
+TiMidity*file_simplemenu.about.label: About
+TiMidity*file_simplemenu.quit.label: Quit (Meta-Q, Q)
+TiMidity*load_dialog.label: File Name
+TiMidity*load_dialog.OK.label: OK
+TiMidity*load_dialog.add.label: Add ALL
+TiMidity*load_dialog.cancel.label: Cancel
+TiMidity*flist_cmdbox.fplaybutton.label: Play
+TiMidity*flist_cmdbox.fdeletebutton.label: Delete
+TiMidity*flist_cmdbox.fdelallbutton.label: Delete ALL
+TiMidity*popup_abox.OK.label: OK
+TiMidity*modul_box.modul_lbl.label: Modulation control
+TiMidity*porta_box.porta_lbl.label: Portamento control
+TiMidity*nrpnv_box.nrpnv_lbl.label: NRPN Vibration
+TiMidity*reverb_box.reverb_lbl.label: Reverb control
+TiMidity*chorus_box.chorus_lbl.label: Chorus control
+TiMidity*chpressure_box.chpressure_lbl.label: Channel Pressure control
+TiMidity*overlapvoice_box.overlapv_lbl.label: Allow Multiple Same Notes
+TiMidity*txtmeta_box.txtmeta_lbl.label: Tracing All Text Meta Events
+TiMidity*closebutton.label: Close
+TiMidity*base_form.translations: #override\n\
+		~Ctrl Meta<Key>s:	do-menu(101)\n\
+		Ctrl<Key>m:		do-menu(102)\n\
+		Ctrl<Key>t:		do-menu(103)\n\
+		Ctrl<Key>s:		do-menu(104)\n\
+		Ctrl<Key>r:		do-menu(105)\n\
+		~Ctrl Meta<Key>n:	do-load()\n\
+		<Key>Right:		do-next()\n\
+		~Meta<Key>n:		do-next()\n\
+		<Key>Left:		do-prev()\n\
+		<Key>p:			do-prev()\n\
+		<Key>KP_Enter:		do-play()\n\
+		<Key>Return:		do-play()\n\
+		~Ctrl<Key>r:		do-play()\n\
+		~Ctrl<Key>f:		do-forward()\n\
+		~Ctrl<Key>b:		do-back()\n\
+		~Ctrl<Key>space:	do-pause()\n\
+		~Ctrl<Key>s:		do-stop()\n\
+		<Key>Up:		do-volupdown(10)\n\
+		~Ctrl Shift<Key>v:	do-volupdown(10)\n\
+		<Key>Down:		do-volupdown(-10)\n\
+		~Ctrl ~Shift<Key>v:	do-volupdown(-10)\n\
+		<Key>KP_Add:		do-key()\n\
+		~Ctrl<Key>plus:		do-key()\n\
+		<Key>KP_Subtract:	do-key(1)\n\
+		~Shift<Key>-:		do-key(1)\n\
+		~Ctrl<Key>greater:	do-speed()\n\
+		~Ctrl<Key>less:		do-speed(1)\n\
+		~Ctrl Shift<Key>o:	do-voice(1)\n\
+		~Ctrl ~Shift<Key>o:	do-voice()\n\
+		~Ctrl<Key>g:		do-sndspec()\n\
+		~Ctrl<Key>x:		do-exchange()\n\
+		~Ctrl<Key>t:		do-toggletrace()\n\
+		<Key>l:			do-filelist()\n\
+		Ctrl<Key>f:		do-filelist()\n\
+		Ctrl<Key>o:		do-options()\n\
+		<Key>a:			do-about()\n\
+		<ConfigureNotify>:	do-resize()\n\
+		~Ctrl<Key>q:		do-quit()
+TiMidity*menu_width: 300
+TiMidity*menu_box.borderWidth: 0
+TiMidity*MenuButton.translations: \
+		<EnterWindow>:		highlight()\n\
+		<LeaveWindow>:		reset()\n\
+		Any<BtnDown>:		reset() fix-menu() PopupMenu()
+TiMidity*Command*international: True
+TiMidity*file_menubutton.menuName: file_simplemenu
+TiMidity*file_menubutton.width: 60
+TiMidity*file_menubutton.height: 26
+TiMidity*file_menubutton.horizDistance: 6
+TiMidity*file_menubutton.vertDistance: 4
+TiMidity*file_menubutton.shadowWidth: 1
+TiMidity*title_menubutton.menuName: title_simplemenu
+TiMidity*title_menubutton.width: 210
+TiMidity*title_menubutton.height: 26
+TiMidity*title_menubutton.resize: false
+TiMidity*title_menubutton.fromHoriz: file_menubutton
+TiMidity*title_menubutton.horizDistance: 6
+TiMidity*title_menubutton.vertDistance: 4
+TiMidity*title_menubutton.shadowWidth: 1
+TiMidity*time_label.label: time / mode
+TiMidity*time_label.width: 92
+TiMidity*time_label.height: 26
+TiMidity*time_label.resize: false
+TiMidity*time_label.fromHoriz: title_menubutton
+TiMidity*time_label.horizDistance: 1
+TiMidity*time_label.vertDistance: 4
+TiMidity*time_label.shadowWidth: 1
+TiMidity*time_label.translations: #override\n\
+		<Btn2Down>:		do-menu(103)\n\
+		<Btn3Down>:		do-exchange()
+TiMidity*button_box.height: 40
+TiMidity*button_box.horizDistance: 4
+TiMidity*button_box.borderWidth: 0
+TiMidity*play_button.width: 32
+TiMidity*play_button.height: 32
+TiMidity*play_button.horizDistance: 1
+TiMidity*play_button.vertDistance: 9
+TiMidity*pause_button.width: 32
+TiMidity*pause_button.height: 32
+TiMidity*pause_button.horizDistance: 1
+TiMidity*pause_button.vertDistance: 1
+TiMidity*stop_button.width: 32
+TiMidity*stop_button.height: 32
+TiMidity*stop_button.horizDistance: 1
+TiMidity*stop_button.vertDistance: 1
+TiMidity*prev_button.width: 32
+TiMidity*prev_button.height: 32
+TiMidity*prev_button.horizDistance: 1
+TiMidity*prev_button.vertDistance: 1
+TiMidity*back_button.width: 32
+TiMidity*back_button.height: 32
+TiMidity*back_button.horizDistance: 1
+TiMidity*back_button.vertDistance: 1
+TiMidity*fwd_button.width: 32
+TiMidity*fwd_button.height: 32
+TiMidity*fwd_button.horizDistance: 1
+TiMidity*fwd_button.vertDistance: 1
+TiMidity*next_button.width: 32
+TiMidity*next_button.height: 32
+TiMidity*next_button.horizDistance: 1
+TiMidity*next_button.vertDistance: 1
+TiMidity*quit_button.width: 32
+TiMidity*quit_button.height: 32
+TiMidity*quit_button.horizDistance: 1
+TiMidity*quit_button.vertDistance: 1
+TiMidity*random_button.width: 32
+TiMidity*random_button.height: 32
+TiMidity*random_button.horizDistance: 4
+TiMidity*random_button.vertDistance: 1
+TiMidity*repeat_button.width: 32
+TiMidity*repeat_button.height: 32
+TiMidity*repeat_button.horizDistance: 1
+TiMidity*repeat_button.vertDistance: 1
+TiMidity*volume_label.vertDistance: 0
+TiMidity*volume_label.borderWidth: 0
+TiMidity*volume_box.vertDistance: 2
+TiMidity*volume_box.borderWidth: 0
+TiMidity*volume_bar.length: 330
+TiMidity*volume_bar.translations: #override\n\
+		~Ctrl Shift<Btn1Down>:	do-volupdown(-50)\n\
+		~Ctrl Shift<Btn3Down>:	do-volupdown(50)\n\
+		Ctrl ~Shift<Btn1Down>:	do-volupdown(-5)\n\
+		Ctrl ~Shift<Btn3Down>:	do-volupdown(5)\n\
+		<Btn1Down>:		MoveThumb()\n\
+		<BtnUp>:		NotifyScroll(FullLength) EndScroll()
+TiMidity*tune_label.label: ----
+TiMidity*tune_label.horizDistance: 0
+TiMidity*tune_label.vertDistance: 0
+TiMidity*tune_label0.horizDistance: 0
+TiMidity*tune_box.vertDistance: 2
+TiMidity*tune_box.borderWidth: 0
+TiMidity*tune_bar.length: 330
+TiMidity*tune_bar.translations: #override\n\
+		<Btn1Up>:		do-tuneset()\n\
+		<Btn3Up>:		do-tuneslide()\n\
+		<Btn1Down>:		MoveThumb()\n\
+		<BtnUp>:		NotifyScroll(FullLength) EndScroll()
+TiMidity*lyric_text.international: True
+TiMidity*lyric_text.height: 120
+TiMidity*lyric_text.fromVert: tune_box
+TiMidity*lyric_text.horizDistance: 6
+TiMidity*lyric_text.vertDistance: 4
+TiMidity*lyric_text.borderWidth: 1
+TiMidity*lyric_text.scrollVertical: WhenNeeded
+TiMidity*lyric_text.translations: #override\n\
+		<Btn2Down>:		do-deltext()
+TiMidity*trace.vertDistance: 2
+TiMidity*trace.borderWidth: 1
+TiMidity*trace.translations: #override\n\
+		<Btn1Down>:		do-toggletrace()\n\
+		<EnterNotify>:		do-revcaption()\n\
+		<LeaveNotify>:		do-revcaption()\n\
+		<Expose>:		draw-trace()
+TiMidity*trace_vport.borderWidth: 1
+TiMidity*popup_load.title: TiMidity <Load File>
+TiMidity*popup_loadform.height: 400
+TiMidity*load_dialog.borderWidth: 0
+TiMidity*load_dialog.height: 132
+TiMidity*load_dialog.value.translations: #override\n\
+		<Key>Escape:		do-dialog-button(1)\n\
+		Ctrl ~Shift<Key>g:	do-dialog-button(1)\n\
+		~Ctrl<Key>KP_Enter:	do-chgdir()\n\
+		~Ctrl<Key>Return:	do-chgdir()\n\
+		<Key>BackSpace:		do-backspace() delete-previous-character()\n\
+		~Ctrl ~Meta<Key>Tab:	do-complete() end-of-line()
+TiMidity*popup_file.title: TiMidity <File List>
+TiMidity*popup_fbox.translations: #override\n\
+		~Ctrl<Key>c:		do-closeparent()\n\
+		<Key>Down:		do-flistmove(1)\n\
+		<Key>n:			do-flistmove(1)\n\
+		<Key>Up:		do-flistmove(-1)\n\
+		<Key>p:			do-flistmove(-1)\n\
+		<Key>Next:		do-flistmove(5)\n\
+		<Key>Left:		do-flistmove(5)\n\
+		<Key>Prior:		do-flistmove(-5)\n\
+		<Key>Right:		do-flistmove(-5)\n\
+		<Key>KP_Enter:		do-fselect()\n\
+		<Key>Return:		do-fselect()\n\
+		Ctrl<Key>m:		do-fselect()\n\
+		~Ctrl<Key>r:		do-fselect()\n\
+		<Key>d:			do-fdelete()\n\
+		~Ctrl<Key>f:		do-forward()\n\
+		~Ctrl<Key>b:		do-back()\n\
+		<Key>space:		do-pause()\n\
+		<Key>s:			do-stop()\n\
+		Shift<Key>v:		do-volupdown(10)\n\
+		~Shift<Key>v:		do-volupdown(-10)\n\
+		~Ctrl<Key>q:		do-quit()
+TiMidity*popup_option.title: TiMidity <Extend Modes>
+TiMidity*popup_optbox*international: True
+TiMidity*popup_optbox.translations: #override\n\
+		~Ctrl<Key>c:		do-closeparent()\n\
+		~Ctrl<Key>q:		do-quit()
+TiMidity*popup_about.title: Information
+TiMidity*popup_abox.translations: #override\n\
+		~Ctrl<Key>c:		do-closeparent()\n\
+		<Key>KP_Enter:		do-closeparent()\n\
+		<Key>Return:		do-closeparent()
+TiMidity*foreground: #c0c0c0
+TiMidity*background: #171717
+TiMidity*BoxColor: #666666
+TiMidity*Scrollbar*background: gray82
+TiMidity*ButtonForeground: #c0c0c0
+TiMidity*ButtonBackground: #444444
+TiMidity*ToggleForeground: #c0c0f0
+TiMidity*MenuButtonBackground: #839573
+TiMidity*menu_box*Foreground: #000000
+TiMidity*menu_box*SimpleMenu*Foreground: #c0c0c0
+TiMidity*Command.background: gray78
+TiMidity*Label.foreground: black
+TiMidity*Label.background: #CCFF33
+TiMidity*Text*background: gray82
+TiMidity*Text*scrollbar*background: gray82
+TiMidity*TextBackground: #666666
+TiMidity*Text2Background: #4e5945
+TiMidity*Dialog.Command.background: gray78
+TiMidity*Dialog.Text.background: gray82
+TiMidity*lyric_text*Foreground: #c0c0c0
+TiMidity*lyric_text*Background: #444444
+TiMidity*lyric_text*Scrollbar*Background: #666666
+TiMidity*TraceBackground: #4e5945
+TiMidity*VelForeground: #c0a080
+TiMidity*VelDrumForeground: #c08080
+TiMidity*VolForeground: #c0b0b0
+TiMidity*PanForeground: #a0a0c0
+TiMidity*ReverbColor: #c0c080
+TiMidity*CaptionColor: #a0a0a0
+TiMidity*ExpForeground: #80c0c0
+TiMidity*ChorusColor: #c0b080
+TiMidity*WhiteKeyColor: #d8d8d8
+TiMidity*trace_vport*background: #666666
+TiMidity*load_dialog.label.background: gray67
+TiMidity*popup_load*Viewport*background: #666666
+TiMidity*popup_load*load_dialog.Command*background: #666666
+TiMidity*popup_load*load_dialog*label*background: #666666
+TiMidity*popup_load*load_dialog*value.background: #666666
+TiMidity*popup_load*load_dialog*value.MultiSrc.background: #666666
+TiMidity*popup_load*load_dialog*value.MultiSink.background: #666666
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.background: #c0c0c0
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Label.background: #c0c0c0
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Toggle.foreground: #000000
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Toggle.background: #c0c0c0
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Command.foreground: #000000
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Command.background: #c0c0c0
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.foreground: #000000
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.background: #e7e7e7
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.borderColor: #6f6f6f
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSrc.foreground: #000000
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSrc.background: #e7e7e7
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSink.foreground: #000000
+TiMidity*popup_load*load_dialog*value*TransientShell.Form.Text.MultiSink.background: #e7e7e7
+TiMidity*popup_load*popup_loadform*load_dialog*label*foreground: #c0c0c0
+TiMidity*popup_load*popup_loadform*cwd_label*foreground: #c0c0c0
+TiMidity*popup_load*popup_loadform*cwd_info*foreground: #c0c0c0
+TiMidity*popup_file*background: #666666
+TiMidity*popup_option*background: #666666
+TiMidity*popup_about*background: #666666
+TiMidity*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-*-*
+TiMidity*Form*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*MenuButton*fontSet: -adobe-helvetica-bold-r-normal--14-*-*-*-*-*-*-*
+TiMidity*TextFontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-*-*
+TiMidity*SmeBSB.fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*Command*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-*-*
+TiMidity*List*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*Label*fontSet: -adobe-helvetica-bold-o-normal--14-*-*-*-*-*-*-*
+TiMidity*cwd_label.font: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*Text*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-*-*
+TiMidity*file_menubutton.file_simplemenu*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*title_menubutton.title_simplemenu*fontSet: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*time_label.font: -adobe-helvetica-bold-r-normal--14-*-*-*-*-*-*-*
+TiMidity*time_label*cwd_info.font: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-*-*
+TiMidity*volume_box*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-*-*
+TiMidity*tune_box*fontSet: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-*-*
+TiMidity*popup_loadform.load_dialog.label.fontSet: -adobe-helvetica-bold-o-normal--14-*-*-*-*-*-*-*
+TiMidity*popup_abox*fontSet: -adobe-helvetica-bold-o-normal--14-*-*-*-*-*-*-*