← Back to branch summary

~ubuntu-branches/ubuntu/wily/me-tv/wily-proposed

« back to all changes in this revision

Viewing changes to src/engine.cc

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lamothe
  • Date: 2010-05-22 13:10:32 UTC
  • mfrom: (1.1.12 upstream) (3.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100522131032-ibethpcgb8lpwt1w
Tags: 1.2.4-1
* New upstream release
* Maintainer change to Michael Lamothe
* Updated debian/control
  - Added libunique-dev to Build-Depends
  - Added libdbus-glib-1-dev to Build-Depends
* Added me-tv-player.1 to debian/me-tv.manpages

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine.cc
28
28
#define KILL_SLEEP_TIME         100000
29
29
#define KILL_SLEEP_TIMEOUT  2000000
30
30
 
31
 
Engine::Engine(const Glib::ustring& engine_type)
 
31
Engine::Engine()
32
32
{
33
33
        pid = -1;
34
34
        mute_state = false;
36
36
        audio_channel_state = AUDIO_CHANNEL_STATE_BOTH;
37
37
        audio_stream = 0;
38
38
        subtitle_stream = -1;
39
 
        type = engine_type;
40
39
 
41
40
        Gtk::DrawingArea* drawing_area_video = NULL;
42
41
        get_application().get_builder()->get_widget("drawing_area_video", drawing_area_video);
61
60
        g_debug("Engine::play(\"%s\")", mrl.c_str());
62
61
 
63
62
        StringList argv;
64
 
        argv.push_back("me-tv-" + type);
 
63
        argv.push_back("me-tv-player");
65
64
        argv.push_back(Glib::ustring::compose("fifo://%1", mrl));
66
65
        argv.push_back(Glib::ustring::compose("%1", window));
67
 
        argv.push_back(application.get_string_configuration_value("xine.video_driver"));
68
 
        argv.push_back(application.get_string_configuration_value("xine.audio_driver"));
 
66
        argv.push_back(application.get_string_configuration_value("video_driver"));
 
67
        argv.push_back(application.get_string_configuration_value("audio_driver"));
69
68
        argv.push_back(application.get_string_configuration_value("deinterlace_type"));
70
69
        argv.push_back(mute_state ? "true" : "false");
71
70