Changeset 4650


Ignore:
Timestamp:
Nov 13, 2013 2:33:31 AM (7 years ago)
Author:
riza
Message:

Re #1704: fixed some build warnings and errors

Location:
pjproject/branches/projects/winphone
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/winphone/pjmedia/build/pjmedia_audiodev.vcxproj

    r4618 r4650  
    432432      <CompileAsWinRT>false</CompileAsWinRT> 
    433433      <MinimalRebuild>true</MinimalRebuild> 
     434      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 
    434435    </ClCompile> 
    435436    <Lib> 
  • pjproject/branches/projects/winphone/pjsip-apps/src/pjsua/wp/build/pjsua_wp_backend.vcxproj

    r4618 r4650  
    152152      <AdditionalIncludeDirectories>../../../../../pjsip/include;../../../../../pjlib/include;../../../../../pjlib-util/include;../../../../../pjmedia/include;../../../../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    153153      <AdditionalOptions>/D "_WIN32_WINPHONE" /D "PJ_M_ARMV7=1" %(AdditionalOptions)</AdditionalOptions> 
    154       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 
     154      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 
    155155    </ClCompile> 
    156156    <Link> 
     
    188188      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Default</CompileAs> 
    189189      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsC</CompileAs> 
     190      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> 
    190191    </ClCompile> 
    191192    <ClCompile Include="..\..\pjsua_app_cli.c"> 
     
    193194      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Default</CompileAs> 
    194195      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsC</CompileAs> 
     196      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> 
    195197    </ClCompile> 
    196198    <ClCompile Include="..\..\pjsua_app_common.c"> 
     
    198200      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Default</CompileAs> 
    199201      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsC</CompileAs> 
     202      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> 
    200203    </ClCompile> 
    201204    <ClCompile Include="..\..\pjsua_app_config.c"> 
     
    203206      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Default</CompileAs> 
    204207      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsC</CompileAs> 
     208      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> 
    205209    </ClCompile> 
    206210    <ClCompile Include="..\..\pjsua_app_legacy.c"> 
     
    208212      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Default</CompileAs> 
    209213      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsC</CompileAs> 
    210     </ClCompile> 
    211     <ClCompile Include="..\backend\Globals.cpp" /> 
     214      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> 
     215    </ClCompile> 
     216    <ClCompile Include="..\backend\Globals.cpp"> 
     217      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MultiThreadedDLL</RuntimeLibrary> 
     218    </ClCompile> 
    212219    <ClCompile Include="..\backend\PjsuaCallback.cpp" /> 
    213220  </ItemGroup> 
  • pjproject/branches/projects/winphone/pjsip-apps/src/pjsua/wp/pjsua_wp/App.xaml.cs

    r4618 r4650  
    2424    public partial class App : Application 
    2525    { 
    26         /// <summary> 
    27         /// Provides easy access to the root frame of the Phone Application. 
    28         /// </summary> 
    29         /// <returns>The root frame of the Phone Application.</returns> 
    3026        public PhoneApplicationFrame RootFrame { get; private set; } 
    3127 
    32         /// <summary> 
    33         /// The push channel URI for this application 
    34         /// </summary> 
    35         //public Uri PushChannelUri { get; private set; } 
    36  
    37         /// <summary> 
    38         /// An event that is raised when the push channel URI changes 
    39         /// </summary> 
    40         //public event EventHandler<Uri> PushChannelUriChanged; 
    41  
    42         /// <summary> 
    43         /// Constructor for the Application object. 
    44         /// </summary> 
    4528        public App() 
    4629        { 
     
    5336            // Phone-specific initialization 
    5437            InitializePhoneApplication(); 
    55  
    56             // Initialize the push channel 
    57             //InitPushChannel(); 
    58  
    59             // Initialize the task to listen to incoming call notifications on the push channel 
    60             //InitHttpNotificationTask(); 
    61  
    62             // Initalize the task to perform periodic maintenance 
    63             //InitKeepAliveTask(); 
    6438 
    6539            // Show graphics profiling information while debugging. 
     
    8458        } 
    8559 
    86         // Code to execute when the application is launching (eg, from Start) 
    87         // This code will not execute when the application is reactivated 
    8860        private void Application_Launching(object sender, LaunchingEventArgs e) 
    8961        { 
    9062            Debug.WriteLine("[App] Launching"); 
    91  
    92             // Call this method below at the beginning of this handler, 
    93             // to let the background process that the UI is entering the foreground. 
    94             //BackgroundProcessController.Instance.ConnectUi(); 
    95  
    96             // Do something, if required 
    9763        } 
    9864 
    99         // Code to execute when the application is activated (brought to foreground) 
    100         // This code will not execute when the application is first launched 
    10165        private void Application_Activated(object sender, ActivatedEventArgs e) 
    10266        { 
    10367            Debug.WriteLine("[App] Activated"); 
    104  
    105             // Call this method below at the beginning of this handler, 
    106             // to let the background process that the UI is entering the foreground. 
    107             //BackgroundProcessController.Instance.ConnectUi(); 
    108  
    109             // Do something, if required 
    11068        } 
    11169 
    112         // Code to execute when the application is deactivated (sent to background) 
    113         // This code will not execute when the application is closing 
    11470        private void Application_Deactivated(object sender, DeactivatedEventArgs e) 
    11571        { 
    11672            Debug.WriteLine("[App] Deactivated"); 
    117  
    118             // Do something, if required 
    119  
    120             // Call this method below at the end of this handler, 
    121             // to let the background process that the UI is leaving the foreground. 
    122             //BackgroundProcessController.Instance.DisconnectUi(); 
    12373        } 
    12474 
    125         // Code to execute when the application is closing (eg, user hit Back) 
    126         // This code will not execute when the application is deactivated 
    12775        private void Application_Closing(object sender, ClosingEventArgs e) 
    12876        { 
    12977            Debug.WriteLine("[App] Closing"); 
    130  
    131             // Do something, if required 
    132  
    133             // Call this method below at the end of this handler, 
    134             // to let the background process that the UI is leaving the foreground. 
    135             //BackgroundProcessController.Instance.DisconnectUi(); 
    13678        } 
    13779 
     
    190132        } 
    191133 
    192         // The name of our push channel. 
    193         //private const string pushChannelName = "PhoneVoIPApp.PushChannel"; 
    194  
    195         //private void InitPushChannel() 
    196         //{ 
    197         //    // Try to find the push channel. 
    198         //    HttpNotificationChannel httpChannel = HttpNotificationChannel.Find(App.pushChannelName); 
    199  
    200         //    // If the channel was not found, then create a new connection to the push service. 
    201         //    if (httpChannel == null) 
    202         //    { 
    203         //        // We need to create a new channel. 
    204         //        httpChannel = new HttpNotificationChannel(App.pushChannelName); 
    205         //        httpChannel.Open(); 
    206         //    } 
    207         //    else 
    208         //    { 
    209         //        // This is an existing channel. 
    210         //        this.PushChannelUri = httpChannel.ChannelUri; 
    211  
    212         //        Debug.WriteLine("[App] Existing Push channel URI is {0}", this.PushChannelUri); 
    213  
    214         //        //  Let listeners know that we have a push channel URI 
    215         //        if (this.PushChannelUriChanged != null) 
    216         //        { 
    217         //            this.PushChannelUriChanged(this, this.PushChannelUri); 
    218         //        } 
    219  
    220         //        // TODO: Let your cloud server know that the push channel to this device is this.PushChannelUri. 
    221         //    } 
    222  
    223         //    // Register for all the events. 
    224         //    httpChannel.ChannelUriUpdated += new EventHandler<NotificationChannelUriEventArgs>(PushChannel_ChannelUriUpdated); 
    225         //    httpChannel.ErrorOccurred += new EventHandler<NotificationChannelErrorEventArgs>(PushChannel_ErrorOccurred); 
    226         //    httpChannel.HttpNotificationReceived += new EventHandler<HttpNotificationEventArgs>(PushChannel_HttpNotificationReceived); 
    227         //} 
    228  
    229         //private void PushChannel_ChannelUriUpdated(object sender, NotificationChannelUriEventArgs e) 
    230         //{ 
    231         //    Debug.WriteLine("[App] New Push channel URI is {0}", e.ChannelUri); 
    232  
    233         //    // Store the push channel URI 
    234         //    this.PushChannelUri = e.ChannelUri; 
    235  
    236         //    //  Let listeners know that we have a push channel URI 
    237         //    if (this.PushChannelUriChanged != null) 
    238         //    { 
    239         //        this.PushChannelUriChanged(this, this.PushChannelUri); 
    240         //    } 
    241  
    242         //    // TODO: Let your cloud server know that the push channel to this device is e.ChannelUri. 
    243         //} 
    244  
    245         //private void PushChannel_ErrorOccurred(object sender, NotificationChannelErrorEventArgs e) 
    246         //{ 
    247         //    // TODO: Let your cloud server know that the push channel to this device is no longer valid. 
    248         //} 
    249  
    250         //private void PushChannel_HttpNotificationReceived(object sender, HttpNotificationEventArgs e) 
    251         //{ 
    252         //    // TODO: Process raw push notifications here, if required. 
    253         //} 
    254  
    255         // The name of the incoming call task. 
    256         //private const string incomingCallTaskName = "PhoneVoIPApp.IncomingCallTask"; 
    257  
    258         //public void InitHttpNotificationTask() 
    259         //{ 
    260         //    // Obtain a reference to the existing task, if any. 
    261         //    VoipHttpIncomingCallTask incomingCallTask = ScheduledActionService.Find(App.incomingCallTaskName) as VoipHttpIncomingCallTask; 
    262         //    if (incomingCallTask != null) 
    263         //    { 
    264         //        if (incomingCallTask.IsScheduled == false) 
    265         //        { 
    266         //            // The incoming call task has been unscheduled due to OOM or throwing an unhandled exception twice in a row 
    267         //            ScheduledActionService.Remove(App.incomingCallTaskName); 
    268         //        } 
    269         //        else 
    270         //        { 
    271         //            // The incoming call task has been scheduled and is still scheduled so there is nothing more to do 
    272         //            return; 
    273         //        } 
    274         //    } 
    275  
    276         //    // Create a new incoming call task. 
    277         //    incomingCallTask = new VoipHttpIncomingCallTask(App.incomingCallTaskName, App.pushChannelName); 
    278         //    incomingCallTask.Description = "Incoming call task"; 
    279         //    ScheduledActionService.Add(incomingCallTask); 
    280         //} 
    281  
    282         // The name of the keep-alive task. 
    283         //private const string keepAliveTaskName = "PjsuaWP.KeepAliveTask"; 
    284  
    285         //public void InitKeepAliveTask() 
    286         //{ 
    287         //    // Obtain a reference to the existing task, if any. 
    288         //    VoipKeepAliveTask keepAliveTask = ScheduledActionService.Find(App.keepAliveTaskName) as VoipKeepAliveTask; 
    289         //    if (keepAliveTask != null) 
    290         //    { 
    291         //        if (keepAliveTask.IsScheduled == false) 
    292         //        { 
    293         //            // The keep-alive task has been unscheduled due to OOM or throwing an unhandled exception twice in a row 
    294         //            ScheduledActionService.Remove(App.keepAliveTaskName); 
    295         //        } 
    296         //        else 
    297         //        { 
    298         //            // The keep-alive task has been scheduled and is still scheduled so there is nothing more to do 
    299         //            return; 
    300         //        } 
    301         //    } 
    302  
    303         //    keepAliveTask = new VoipKeepAliveTask(App.keepAliveTaskName); 
    304         //    keepAliveTask.Interval = new TimeSpan(12, 0, 0); // Every 12 hours 
    305         //    keepAliveTask.Description = "keep-alive task"; 
    306         //    ScheduledActionService.Add(keepAliveTask); 
    307         //} 
    308  
    309134        #endregion 
    310135    } 
Note: See TracChangeset for help on using the changeset viewer.